l10n daemon script 1f8e4bba85 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"		2019-11-20 05:46:13 +01:00
..
actions.ui	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
advanced.ui	Improve comprehensibility and consistency of window placement mode names	2019-09-19 10:34:39 -06:00
AUTHORS
ChangeLog
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
focus.ui	[kcmkwin/options] Improve the look of the KWin options KCM UIs	2019-09-09 21:45:51 +02:00
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-19 05:39:12 +01:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-20 05:46:13 +01:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-20 05:46:13 +01:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-02 05:41:14 +01:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-11-19 05:39:12 +01:00
main.cpp	[kcmkwin/options] Improve the look of the KWin options KCM UIs	2019-09-09 21:45:51 +02:00
main.h
Messages.sh
mouse.cpp	Use nullptr everywhere	2019-09-19 17:48:21 +03:00
mouse.h
mouse.ui	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
moving.ui	[kcmkwin/options] Improve the look of the KWin options KCM UIs	2019-09-09 21:45:51 +02:00
windows.cpp	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
windows.h	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00