l10n daemon script 99237c9b3f 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"		2015-06-01 10:08:03 +00:00
..
actions.ui
advanced.ui
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
kwinadvanced.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
kwinfocus.desktop
kwinmoving.desktop
kwinoptions.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
main.cpp
main.h
Messages.sh
mouse.cpp
mouse.h
mouse.ui
moving.ui
windows.cpp
windows.h