l10n daemon script 155b6ecb3b 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-06-11 04:45:20 +02:00
..
CMakeLists.txt
desktop.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-06-11 04:45:20 +02:00
desktopnameswidget.cpp
desktopnameswidget.h
main.cpp
main.h
main.ui
Messages.sh