l10n daemon script e5546c9236 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-02-09 05:53:12 +01:00
..
actions.ui
advanced.ui	kcms/kwinoptions : convert Advanced part to KConfigXT	2020-02-06 09:06:41 +01:00
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-02-09 05:53:12 +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
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
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