l10n daemon script 02babfa36e 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"		2019-06-20 08:54:54 +02:00
..
CMakeLists.txt
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp	Remove deprecated method	2019-03-01 08:15:31 +01:00
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-20 08:54:54 +02:00
kwinsrc.cpp
main.cpp
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
ruleswidget.cpp	[kcmkwin/rules] Return absolute path of decoration color scheme	2019-01-14 22:05:04 +02:00
ruleswidget.h
ruleswidgetbase.ui	[kcmkwin/rules] Fix line separators in the dialog	2019-01-30 15:56:28 +02:00
yesnobox.h