l10n daemon script dd289b5dee 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-12-26 05:59:30 +01:00
..
CMakeLists.txt	Use KPackage in kcmscripts	2016-10-07 13:27:19 +01:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinscripts.knsrc	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-26 05:59:30 +01:00
main.cpp
Messages.sh
module.cpp	[Scripts KCM] Use GHNS Button instead of creating a look-alike button	2016-12-13 08:26:15 +01:00
module.h	[Scripts KCM] Use GHNS Button instead of creating a look-alike button	2016-12-13 08:26:15 +01:00
module.ui	[Scripts KCM] Use GHNS Button instead of creating a look-alike button	2016-12-13 08:26:15 +01:00
version.h.cmake