kwin/kcmkwin/kwinscripts
l10n daemon script 3fcb19f42f 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"
2017-02-23 06:22:20 +01:00
..
CMakeLists.txt Port Plasma::Package to KPackage 2016-12-26 17:41:06 +01:00
kwinscripts.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2016-12-20 13:30:44 +01:00
kwinscripts.knsrc SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-23 06:22:20 +01:00
main.cpp
Messages.sh
module.cpp Port Plasma::Package to KPackage 2016-12-26 17:41:06 +01:00
module.h [Scripts KCM] Use GHNS Button instead of creating a look-alike button 2016-12-13 08:26:15 +01:00
module.ui [Scripts KCM] Use GHNS Button instead of creating a look-alike button 2016-12-13 08:26:15 +01:00
version.h.cmake