Merge remote-tracking branch 'origin/story1266_3d_model_factory' into story1266_3d_model_factory

Browse Source

...

This commit is contained in:

cir27

2017-09-10 22:54:49 +12:00

parent 470bf121a5 06a4dde216

commit e3ccb570ed

8 changed files with 619 additions and 213 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

src/main/resources/meshes/mark_area.dae

+39 -39

File diff suppressed because one or more lines are too long