l10n daemon script aa0f2c88f0 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-01-10 11:46:53 +00: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	2016-01-10 11:46:53 +00:00
kwinsrc.cpp
main.cpp
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
ruleswidget.cpp	Add rule to protect the focus on a window	2015-11-17 21:30:05 +01:00
ruleswidget.h	Add rule to protect the focus on a window	2015-11-17 21:30:05 +01:00
ruleswidgetbase.ui	Fix minor typo	2015-11-18 19:07:09 +02:00
yesnobox.h