Petr Mrázek 9d724e0fe4 Merge remote-tracking branch 'origin/feature_cmake_style' into develop ...

Conflicts:
	CMakeLists.txt

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

..

CMakeLists.txt

Use the same style of CMake files everywhere

2014-04-06 19:43:09 +02:00

mmc_de.ts

Update FR translation some more.

2014-04-21 21:46:12 +02:00

mmc_fr.ts

Update FR translation some more.

2014-04-21 21:46:12 +02:00