Merge branch 'develop' into mergebranch-Jasper

Browse Source

...

This commit is contained in:

SemvdH

2021-06-11 10:27:30 +02:00

committed by GitHub

parent 509f64f04d dbecbb594e

commit ab7123b89a

46 changed files with 28302 additions and 4730 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

res/House.obj

-4495

File diff suppressed because it is too large Load Diff

res/beeTwo.obj

+21593

File diff suppressed because it is too large Load Diff

res/pose/coco/pose_deploy_linevec.prototxt

+2976

File diff suppressed because it is too large Load Diff

res/pose/mpi/pose_deploy_linevec_faster_4_stages.prototxt

+2081

File diff suppressed because it is too large Load Diff