l10n daemon script 53a6cde141 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-02-04 06:23:35 +01:00
..
app	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-04 06:23:35 +01:00
components	Port some missing debug output to categorized logging	2017-01-14 19:15:26 +01:00
CMakeLists.txt	rename from active to mobile	2015-08-05 16:54:48 +02:00