l10n daemon script 9f3b817bdc 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"		2020-03-19 05:51:04 +01:00
..
actions.ui	Remove disabled TabGroup feature	2019-09-14 10:58:48 +02:00
advanced.ui	kcms/kwinoptions : convert Advanced part to KConfigXT	2020-02-06 09:06:41 +01:00
AUTHORS
ChangeLog
CMakeLists.txt	kcms/kwinoptions : convert Moving part to KConfigXT	2020-02-05 15:05:22 +01:00
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-03-19 05:51:04 +01:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +01:00
kwinoptions_settings.kcfg	kcms/kwinoptions : convert Advanced part to KConfigXT	2020-02-06 09:06:41 +01:00
kwinoptions_settings.kcfgc	kcms/kwinoptions : convert Moving part to KConfigXT	2020-02-05 15:05:22 +01:00
main.cpp	kcms/kwinoptions : convert Advanced part to KConfigXT	2020-02-06 09:06:41 +01:00
main.h
Messages.sh
mouse.cpp
mouse.h
mouse.ui
moving.ui	kcms/kwinoptions : convert Moving part to KConfigXT	2020-02-05 15:05:22 +01:00
windows.cpp	kcms/kwinoptions : convert Advanced part to KConfigXT	2020-02-06 09:06:41 +01:00
windows.h	kcms/kwinoptions : convert Advanced part to KConfigXT	2020-02-06 09:06:41 +01:00