l10n daemon script aff81afd27 SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2015-12-30 09:40:57 +00:00
..
plastik	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-30 09:40:57 +00:00
CMakeLists.txt	Port of Plastik decoration to QML	2012-08-26 20:56:19 +02:00