Merge pull request #3043 from bmiklautz/prep2.0
authorMartin Fleisz <martin.fleisz@thincast.com>
Tue, 12 Jan 2016 18:07:33 +0000 (19:07 +0100)
committerMartin Fleisz <martin.fleisz@thincast.com>
Tue, 12 Jan 2016 18:07:33 +0000 (19:07 +0100)
Build system improvements and changes

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge