l10n daemon script b160c5babb 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"		2017-03-25 04:37:53 +01: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	2017-03-25 04:37:53 +01:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-03-25 04:37:53 +01:00
main.cpp	Adapt to changes in KAboutData.	2014-05-14 05:04:40 +02:00
main.h	KF5 port KTabWidget -> QTabWidget	2013-12-16 10:10:17 +01:00
Messages.sh
mouse.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
mouse.h	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00
mouse.ui
moving.ui	KF5 Port KIntNumInput->QSpinBox	2013-12-13 08:54:42 +01:00
windows.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
windows.h	[kwin/kcmkwinoption] Remove not needed config-workspace.h include	2014-03-18 07:32:45 +01:00