l10n daemon script aa0f2c88f0 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"		2016-01-10 11:46:53 +00:00
..
CMakeLists.txt
desktop.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-10 11:46:53 +00:00
desktopnameswidget.cpp
desktopnameswidget.h
main.cpp	Fix loading of effect config plugins	2015-03-06 12:22:05 +01:00
main.h
main.ui
Messages.sh