l10n daemon script 3433b05c97 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-11-04 17:27:21 +00:00
..
CMakeLists.txt	XCB::CURSOR becomes a required dependency	2015-06-04 17:50:29 +02:00
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-04 17:27:21 +00:00
kwinsrc.cpp	[wayland] Support pointer warping in the backends	2015-06-06 17:43:13 +02:00
main.cpp	set still required xcb properties in findRule	2015-06-03 21:22:38 +02:00
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
ruleswidget.cpp	Fixing activities list in the rulewidget	2015-06-02 20:10:48 +02:00
ruleswidget.h	Fixing activities list in the rulewidget	2015-06-02 20:10:48 +02:00
ruleswidgetbase.ui
yesnobox.h