kwin/kcmkwin/kwinoptions
l10n daemon script e5546c9236 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"
2020-02-09 05:53:12 +01:00
..
actions.ui Remove disabled TabGroup feature 2019-09-14 10:58:48 +02:00
advanced.ui kcms/kwinoptions : convert Advanced part to KConfigXT 2020-02-06 09:06:41 +01:00
AUTHORS
ChangeLog
CMakeLists.txt kcms/kwinoptions : convert Moving part to KConfigXT 2020-02-05 15:05:22 +01:00
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 2020-02-09 05:53:12 +01:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 05:53:12 +01:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 05:53:12 +01:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 05:53:12 +01:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 05:53:12 +01:00
kwinoptions_settings.kcfg kcms/kwinoptions : convert Advanced part to KConfigXT 2020-02-06 09:06:41 +01:00
kwinoptions_settings.kcfgc kcms/kwinoptions : convert Moving part to KConfigXT 2020-02-05 15:05:22 +01:00
main.cpp kcms/kwinoptions : convert Advanced part to KConfigXT 2020-02-06 09:06:41 +01:00
main.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
Messages.sh
mouse.cpp Use nullptr everywhere 2019-09-19 17:48:21 +03:00
mouse.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
mouse.ui Remove disabled TabGroup feature 2019-09-14 10:58:48 +02:00
moving.ui kcms/kwinoptions : convert Moving part to KConfigXT 2020-02-05 15:05:22 +01:00
windows.cpp kcms/kwinoptions : convert Advanced part to KConfigXT 2020-02-06 09:06:41 +01:00
windows.h kcms/kwinoptions : convert Advanced part to KConfigXT 2020-02-06 09:06:41 +01:00