l10n daemon script bb7051dd3a 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-10-18 05:38:34 +02:00
..
CMakeLists.txt	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-10-18 05:38:34 +02:00
kwinsrc.cpp
main.cpp	Enable HiDPI rendering for rules dialog and killer dialog.	2019-09-16 15:06:35 +03:00
Messages.sh
ruleslist.cpp	Delete unused includes	2019-09-06 16:07:55 +03:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp	Don't initialize QFlags<T> with nullptr	2019-09-19 21:42:34 +03:00
ruleswidget.h
ruleswidgetbase.ui	Improve comprehensibility and consistency of window placement mode names	2019-09-19 10:34:39 -06:00
yesnobox.h