l10n daemon script 8725f2441e 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-22 05:17:38 +01:00
..
CMakeLists.txt
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-22 05:17:38 +01:00
kwinsrc.cpp
main.cpp
Messages.sh
ruleslist.cpp
ruleslist.h	Replace NULL with nullptr in kcmkwin	2014-01-08 10:30:38 +01:00
ruleslist.ui
ruleswidget.cpp
ruleswidget.h
ruleswidgetbase.ui
yesnobox.h