l10n daemon script 01b61a9ede 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"		2015-03-16 10:12:25 +00:00
..
CMakeLists.txt	Use xcb_cursor library instead of Xlib based one in Cursor	2015-02-06 13:41:18 +01:00
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui	Use resolve_kuit.py to clean i18n*	2014-08-21 13:17:37 +02:00
kcm.cpp	Adapt to changes in KAboutData.	2014-05-14 05:04:40 +02:00
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-03-16 10:12:25 +00:00
kwinsrc.cpp
main.cpp
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
ruleswidget.cpp
ruleswidget.h
ruleswidgetbase.ui	Fix misaligned combo box in window rules kcm	2014-09-15 16:19:50 +02:00
yesnobox.h