Jan Dalheimer 3cd2b898e5 Merge remote-tracking branch 'origin/develop' into feature_cmake_style ... Conflicts: CMakeLists.txt		2014-04-07 17:44:52 +02:00
..
include	Add a MMC-depend field (soft/hard) for version checking	2014-02-02 14:05:07 +01:00
src	Add a MMC-depend field (soft/hard) for version checking	2014-02-02 14:05:07 +01:00
CMakeLists.txt	Merge remote-tracking branch 'origin/develop' into feature_cmake_style	2014-04-07 17:44:52 +02:00