Merge branch 'master' into tridify_ifcgeom_dll

# Conflicts:
#	cmake/CMakeLists.txt
This commit is contained in:
Thomas Krijnen
2016-08-08 10:56:06 +02:00
35 changed files with 1349 additions and 1095 deletions
+303 -312
View File
File diff suppressed because it is too large Load Diff