Tim Vandecasteele f3cc614427 Fix apple build. ... The apple build was broken because the elseif in the CMakeLists is never triggered. Some code was not properly adapted for the new qtmacgoodies. Some paths were not adapted to new split.		2014-09-12 14:24:26 +02:00
..
3rdparty	Fix apple build.	2014-09-12 14:24:26 +02:00
cmd	Merge branch '1.7'	2014-08-29 20:40:33 +02:00
gui	Fix apple build.	2014-09-12 14:24:26 +02:00
libsync	Merge branch '1.7'	2014-08-29 20:40:33 +02:00
CMakeLists.txt	Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7	2014-08-29 20:23:07 +02:00