kwin/kcmkwin/kwinscreenedges
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
..
CMakeLists.txt Undo some recent cmake changes 2019-09-18 13:50:52 +03:00
kwinscreenedges.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
kwintouchscreen.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
main.cpp [kcmkwin/kwinscreenedges] Improve the look of the Screen Edges and Touch Screen KCM UI 2019-08-04 20:40:18 +02: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
screenpreviewwidget.h Run clang-tidy with modernize-use-override check 2019-07-22 20:03:22 +03:00
touch.cpp [kcmkwin/touchscreen+screenedges] Call KRunner KRunner 2019-05-22 12:18:29 -06: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