Merge remote-tracking branch 'official/master' into contrib

Browse Source

Conflicts:
	code/IFCLoader.cpp

...

This commit is contained in:

Léo Terziman

2014-02-26 18:06:46 +01:00

parent b75f27492a de914d375f

commit b90718bd21

4 changed files with 1017 additions and 998 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

code/IFCLoader.cpp

+962 -962

File diff suppressed because it is too large Load Diff