l10n daemon script 262da1b7c9 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-04-07 13:20:00 +00:00
..
contents	make ksplashqml work again	2014-04-23 13:21:22 +02:00
CMakeLists.txt	Rewrite of Login effect to JavaScript	2013-03-04 10:31:27 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00