Merge branch 'master' into performance_improvements

Browse Source

# Conflicts:
#	src/ifcexpressparser/implementation.py
#	src/ifcgeom/IfcGeomFunctions.cpp
#	src/ifcparse/Ifc4.cpp

...

This commit is contained in:

Thomas Krijnen

2016-04-24 15:22:10 +02:00

parent 25a5135e8d 1e262c8768

commit c6d5adfa42

32 changed files with 1271 additions and 371 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/ifcparse/Ifc4enum.h

+1 -1

File diff suppressed because one or more lines are too long