l10n daemon script 818ed8f4ad 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-13 05:42:59 +01:00
..
CMakeLists.txt	[kcmkwin/desktop] Fix activating the desktop effects	2014-05-26 19:25:23 +02:00
desktop.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
desktopnameswidget.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
desktopnameswidget.h	Port KCMDesktop to Qt 5	2013-09-27 13:43:15 +02:00
main.cpp	Fix loading of effect config plugins	2015-03-06 12:22:05 +01:00
main.h	Port KCMDesktop to Qt 5	2013-09-27 13:43:15 +02:00
main.ui	we don't have different widgets for vd anymore	2014-04-11 16:46:28 +02:00
Messages.sh	Extract messages from ui files.	2010-04-16 21:43:13 +00:00