kwin/kcmkwin/kwinoptions
l10n daemon script 4d06e666b3 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"
2019-09-12 05:23:39 +02:00
..
actions.ui [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
advanced.ui [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
AUTHORS
ChangeLog
CMakeLists.txt
focus.ui [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
kwinactions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-12 05:23:39 +02:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-12 05:23:39 +02:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-12 05:23:39 +02:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-12 05:23:39 +02:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-09-12 05:23:39 +02:00
main.cpp [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
main.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
Messages.sh
mouse.cpp [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
mouse.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
mouse.ui [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
moving.ui [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
windows.cpp [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
windows.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00