l10n daemon script 56860e63f5 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-07 21:21:42 +00:00
..
CMakeLists.txt	XCB::CURSOR becomes a required dependency	2015-06-04 17:50:29 +02:00
detectwidget.cpp	optimize string operations	2015-11-05 14:14:06 +00:00
detectwidget.h	[kwin/kcmrules] Use a pointer for the KWindowInfo member variable	2014-01-30 10:35:35 +01:00
detectwidget.ui
editshortcut.ui	Use resolve_kuit.py to clean i18n*	2014-08-21 13:17:37 +02:00
kcm.cpp	lazy setting of xbc properties on qApp	2015-05-15 23:55:28 +02:00
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-07 21:21:42 +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	Fix extraction of two messages in kcmkwinrules	2015-04-09 22:47:37 +03:00
ruleslist.cpp	[kwin] Fix includes of kde4support headers	2014-03-18 14:34:36 +01:00
ruleslist.h
ruleslist.ui	[kwin/kcms] Another round of kdialog removals	2014-03-18 09:11:07 +01:00
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	Fix misaligned combo box in window rules kcm	2014-09-15 16:19:50 +02:00
yesnobox.h	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00