kwin/kcmkwin/kwinscripts
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
kwinscripts.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-10-17 05:41:38 +02:00
kwinscripts.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2019-11-02 05:41:14 +01:00
main.cpp Fix build with CMake 3.10 2017-12-18 11:41:37 +01:00
Messages.sh Import of a KCM for KWin scripts 2011-12-21 07:28:51 +01:00
module.cpp Remove Qt module declarations in includes 2018-06-05 18:07:23 +01:00
module.h Use more traditional doxygen style 2019-07-29 22:06:19 +03:00
module.ui [KCMs] move GHNS buttons to the normal location 2018-10-31 07:29:22 -06:00
version.h.cmake Import of a KCM for KWin scripts 2011-12-21 07:28:51 +01:00