l10n daemon script 2d0f08b006 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"		2017-03-28 09:41:02 +02:00
..
CMakeLists.txt	Port Plasma::Package to KPackage	2016-12-26 17:41:06 +01:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-28 09:41:02 +02:00
main.cpp
Messages.sh
module.cpp	Port Plasma::Package to KPackage	2016-12-26 17:41:06 +01:00
module.h
module.ui
version.h.cmake