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
..
de.po	Merge branch 'dev' into dev-physfs	2014-10-14 15:41:35 +02:00
fr.po	Merge branch 'dev' into dev-physfs	2014-10-14 15:41:35 +02:00
generic.pot	Merge branch 'dev' into dev-physfs	2014-10-14 15:41:35 +02:00
pl.po	Merge branch 'dev' into dev-physfs	2014-10-14 15:41:35 +02:00
ru.po	Merge branch 'dev' into dev-physfs	2014-10-14 15:41:35 +02:00