l10n daemon script 191e10300d 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-11-04 09:43:54 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-04 09:43:54 +00:00
CMakeLists.txt	rename all the active specific desktop files	2015-08-05 16:54:48 +02:00
Messages.sh	Cleanup Messages.sh files for mobile	2016-11-03 23:01:08 +01:00