l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
CMakeLists.txt	[kcmkwin/kwindesktop] Use PackageLoader to get effect metadata	2018-07-06 17:15:23 +03:00
desktop.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02: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	[kcmkwin/kwindesktop] Use PackageLoader to get effect metadata	2018-07-06 17:15:23 +03:00
main.h	Port KCMDesktop to Qt 5	2013-09-27 13:43:15 +02:00
main.ui	Add missing lower and upper bounds to the rows spinbox.	2017-12-05 21:55:20 +09:00
Messages.sh	Extract messages from ui files.	2010-04-16 21:43:13 +00:00