Merge branch 'master' into v0.6.0

Browse Source

# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomShapes.cpp
#	src/serializers/ColladaSerializer.cpp
#	src/serializers/schema_dependent/XmlSerializer.cpp

...

This commit is contained in:

Thomas Krijnen

2018-09-04 13:23:11 +02:00

parent 4babe84941 c2f4c2cf74

commit 4d33ed5cb8

66 changed files with 550 additions and 113668 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

.gitmodules