kwin/kcmkwin/kwindesktop
l10n daemon script 6bb9f6db7b 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"
2015-11-17 13:07:36 +00:00
..
CMakeLists.txt
desktop.desktop
desktopnameswidget.cpp
desktopnameswidget.h
main.cpp
main.h
main.ui
Messages.sh