kwin/kcmkwin/kwinscripts
l10n daemon script 770332dbac 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"
2018-02-25 05:32:33 +01:00
..
CMakeLists.txt
kwinscripts.desktop
kwinscripts.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2018-02-25 05:32:33 +01:00
main.cpp Fix build with CMake 3.10 2017-12-18 11:41:37 +01:00
Messages.sh
module.cpp Remove no longer needed moc include 2017-12-19 02:19:37 +01:00
module.h
module.ui kwinscripts: change i18n string "Get New Scripts..." 2017-10-12 16:46:43 +03:00
version.h.cmake