kwin/kcmkwin/kwinoptions
l10n daemon script f1bbe935d3 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-08-07 05:12:10 +02:00
..
actions.ui
advanced.ui
AUTHORS Update URLs to use https 2019-03-25 19:26:23 +01:00
ChangeLog
CMakeLists.txt
focus.ui
kwinactions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-06 05:42:41 +01:00
kwinadvanced.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-07-31 05:23:00 +02:00
kwinfocus.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-08-07 05:12:10 +02:00
kwinmoving.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-04-06 06:06:15 +02:00
kwinoptions.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-20 05:27:25 +02:00
main.cpp Remove deprecated method 2019-03-01 08:15:31 +01:00
main.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
Messages.sh
mouse.cpp Don't use deprecated toAscii() method 2019-07-10 22:50:00 +03:00
mouse.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
mouse.ui
moving.ui
windows.cpp Don't use deprecated QDesktopWidget 2019-07-10 22:50:41 +03:00
windows.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00