krzys-h 131005c1ae Merge branch 'dev' into dev-physfs ... Conflicts: help/generic/po/de.po help/generic/po/fr.po help/generic/po/generic.pot help/generic/po/pl.po help/generic/po/ru.po		2014-10-14 15:41:35 +02:00
..
bots	Align help translations	2014-09-21 12:25:00 +02:00
cbot	Align help translations	2014-09-21 12:25:00 +02:00
generic	Merge branch 'dev' into dev-physfs	2014-10-14 15:41:35 +02:00
object	Align help translations	2014-09-21 12:25:00 +02:00
CMakeLists.txt	Fixed help files installation	2014-09-29 21:31:51 +02:00