Merge remote-tracking branch 'origin/feature_cmake_style' into develop

Browse Source

Conflicts:
	CMakeLists.txt

...

This commit is contained in:

Petr Mrázek

2014-04-21 23:33:00 +02:00

parent a9dfe6d7ec a00fb1e8da

commit 9d724e0fe4

18 changed files with 753 additions and 814 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

1038

CMakeLists.txt

File diff suppressed because it is too large Load Diff