l10n daemon script ba0b34c755 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"		2018-11-22 06:02:11 +01:00
..
actions.ui
advanced.ui
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinfocus.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinmoving.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-11-22 06:02:11 +01:00
main.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
main.h
Messages.sh
mouse.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
mouse.h
mouse.ui
moving.ui
windows.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
windows.h