kwin/kcmkwin/kwinoptions
l10n daemon script 3433b05c97 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-11-04 17:27:21 +00:00
..
actions.ui
advanced.ui
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2015-11-04 17:27:21 +00:00
main.cpp
main.h
Messages.sh
mouse.cpp 'Defaults' should set the title bar double-click action to 'Maximize.' 2015-06-05 18:03:05 +02:00
mouse.h
mouse.ui
moving.ui
windows.cpp
windows.h