l10n daemon script 98583160cb 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-08-28 10:20:30 +00:00
..
CMakeLists.txt	Update installation variables.	2015-01-10 17:47:31 +00:00
plasma-dataengine-testengine.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-08-28 10:20:30 +00:00
testengine.cpp	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
testengine.h	Use Q_DECL_OVERRIDE where possible	2015-02-13 13:31:58 +01:00