kwin/kcmkwin/kwintabbox
l10n daemon script 2bb025cbdb 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-11-02 05:41:14 +01:00
..
thumbnails [kcmkwin/tabbox] Update window thumbnails 2018-10-02 19:47:58 +03:00
CMakeLists.txt Undo some recent cmake changes 2019-09-18 13:50:52 +03:00
kwinswitcher.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
kwintabbox.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-18 05:38:34 +02:00
layoutpreview.cpp Don't use deprecated QDesktopWidget 2019-07-10 22:50:41 +03:00
layoutpreview.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
main.cpp Don't use deprecated QDesktopWidget 2019-07-10 22:50:41 +03:00
main.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
main.ui Fix invalid tabstop 2019-09-14 10:55:26 +02:00
Messages.sh
thumbnailitem.cpp Use nullptr everywhere 2019-09-19 17:48:21 +03:00
thumbnailitem.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00