l10n daemon script c6aafe23de 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-12-06 09:17:34 +00:00
..
actions.ui
advanced.ui	[kcmkwin/options] Ensure rich text is recognized as rich text	2015-01-14 08:25:20 +01:00
AUTHORS
ChangeLog
CMakeLists.txt	[kcmkwin/options] Load/Unload WindowGeometry effect	2015-01-29 11:44:47 +01:00
focus.ui	fix spinbox width	2014-07-03 18:39:38 +02:00
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-06 09:17:34 +00:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-06 09:17:34 +00:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-07 21:21:42 +00:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-06 09:17:34 +00:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-11-17 13:07:36 +00:00
main.cpp
main.h
Messages.sh
mouse.cpp	'Defaults' should set the title bar double-click action to 'Maximize.'	2015-06-05 18:03:05 +02:00
mouse.h
mouse.ui
moving.ui
windows.cpp	[kcmkwin/options] Load/Unload WindowGeometry effect	2015-01-29 11:44:47 +01:00
windows.h