l10n daemon script 866dfb4e89 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"		2021-01-14 07:04:00 +01:00
..
actions.ui
advanced.ui
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-11 06:35:01 +01:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-01-14 07:04:00 +01:00
kwinoptions_kdeglobals_settings.kcfg
kwinoptions_kdeglobals_settings.kcfgc
kwinoptions_settings.kcfg	Revert "Change the defaults for active screen"	2020-12-03 12:04:10 +02:00
kwinoptions_settings.kcfgc
main.cpp
main.h
Messages.sh
mouse.cpp
mouse.h
mouse.ui
moving.ui
windows.cpp
windows.h