Commit Graph

3 Commits

Author SHA1 Message Date
Thomas Krijnen 08d003ddcd Something went wrong merging submodule 2018-09-04 15:07:14 +02:00
Thomas Krijnen 4d33ed5cb8 Merge branch 'master' into v0.6.0
# Conflicts:
#	src/ifcconvert/IfcConvert.cpp
#	src/ifcgeom/IfcGeomShapes.cpp
#	src/serializers/ColladaSerializer.cpp
#	src/serializers/schema_dependent/XmlSerializer.cpp
2018-09-04 13:23:11 +02:00
Thomas Krijnen dbc3577497 Test files in submodule 2018-08-26 17:09:01 +02:00