l10n daemon script 3dac19023c 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"		2016-02-02 10:51:53 +00:00
..
appletselector.cpp	Run convert-to-cmake-automoc.pl over files	2015-01-20 00:00:31 +01:00
appletselector.h	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
appletselector.ui	dataengines and runners in examples	2013-09-04 11:57:46 +02:00
CMakeLists.txt	Update installation variables.	2015-01-10 17:47:31 +00:00
containmentshell.cpp	Run convert-to-cmake-automoc.pl over files	2015-01-20 00:00:31 +01:00
containmentshell.h	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
main.cpp	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
plasma-default-layoutrc	dataengines and runners in examples	2013-09-04 11:57:46 +02:00
plasma-example-kpart-shell.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-02-02 10:51:53 +00:00
plasma-kpart-shellui.rc	dataengines and runners in examples	2013-09-04 11:57:46 +02:00
testshellpluginloader.cpp	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00
testshellpluginloader.h	Apply the astyle-kdelibs script	2014-04-26 01:48:37 +02:00