l10n daemon script a1c0d43deb 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"		2020-07-23 06:10:20 +02:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
CMakeLists.txt
kcm_kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-07-23 06:10:20 +02:00
kcmrules.cpp
kcmrules.h
kwinsrc.cpp
main.cpp
Messages.sh
optionsmodel.cpp
optionsmodel.h
rulebookmodel.cpp
rulebookmodel.h
ruleitem.cpp
ruleitem.h
rulesdialog.cpp
rulesdialog.h
rulesmodel.cpp
rulesmodel.h