l10n daemon script 01f4cf59ea 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-11-04 17:07:45 +00:00
..
CMakeLists.txt	Update installation variables.	2015-01-10 17:47:31 +00:00
customDataContainersEngine.cpp	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
customDataContainersEngine.h	dataengines and runners in examples	2013-09-04 11:57:46 +02:00
httpContainer.cpp	Run convert-to-cmake-automoc.pl over files	2015-01-20 00:00:31 +01:00
httpContainer.h	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
plasma-dataengine-example-customDataContainers.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-04 17:07:45 +00:00