kwin/kcmkwin/kwinscreenedges
l10n daemon script 78c0095a5d 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-11 05:59:16 +01:00
..
CMakeLists.txt Change project name to "KWin" 2020-01-25 03:05:02 +02:00
kwinscreenedges.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-09 05:53:12 +01:00
kwintouchscreen.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2020-02-11 05:59:16 +01:00
main.cpp Remove some unused includes 2019-11-10 20:26:35 +01:00
main.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
main.ui [kcmkwin/kwinscreenedges] Improve the look of the Screen Edges and Touch Screen KCM UI 2019-08-04 20:40:18 +02:00
Messages.sh
monitor.cpp Don't use deprecated QDesktopWidget 2019-07-10 22:50:41 +03:00
monitor.h Use nullptr everywhere 2019-09-19 17:48:21 +03:00
screenpreviewwidget.cpp [kwin] Mark unused variables as unused 2014-02-03 11:36:21 +01:00
screenpreviewwidget.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
touch.cpp Remove some unused includes 2019-11-10 20:26:35 +01:00
touch.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
touch.ui [kcmkwin/kwinscreenedges] Improve the look of the Screen Edges and Touch Screen KCM UI 2019-08-04 20:40:18 +02:00