kwin/kcmkwin/kwinoptions
l10n daemon script c29c165032 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-12-22 05:40:21 +01:00
..
actions.ui Remove disabled TabGroup feature 2019-09-14 10:58:48 +02:00
advanced.ui Improve comprehensibility and consistency of window placement mode names 2019-09-19 10:34:39 -06:00
AUTHORS Update URLs to use https 2019-03-25 19:26:23 +01:00
ChangeLog branches/work/kwin_composite becomes new trunk kwin. 2007-04-29 17:35:43 +00:00
CMakeLists.txt Cleanup style in CMakeLists.txt files 2019-09-17 16:03:05 +03: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 2019-12-22 05:40:21 +01:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-22 05:40:21 +01:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-22 05:40:21 +01:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-22 05:40:21 +01:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-12-22 05:40:21 +01: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 Extract previously untranslated UI messages. 2013-02-08 00:26:48 +01:00
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 [kcmkwin/options] Improve the look of the KWin options KCM UIs 2019-09-09 21:45:51 +02:00
windows.cpp Remove disabled TabGroup feature 2019-09-14 10:58:48 +02:00
windows.h Remove disabled TabGroup feature 2019-09-14 10:58:48 +02:00