kwin/packageplugins/scripts
l10n daemon script 1a6662e796 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-11-06 04:38:04 +01:00
..
CMakeLists.txt use proper packagestructures 2017-01-20 15:34:56 +01:00
kwin-packagestructure-scripts.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2017-11-06 04:38:04 +01:00
scripts.cpp use proper packagestructures 2017-01-20 15:34:56 +01:00
scripts.h use proper packagestructures 2017-01-20 15:34:56 +01:00