l10n daemon script b16dcf41aa 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"		2019-08-12 08:33:06 +02:00
..
android	android: Fix minSdk	2019-02-15 16:39:17 +01:00
app	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-08-12 08:33:06 +02:00
components	mobile: fully port to QQC2	2019-06-10 20:59:15 +02:00
CMakeLists.txt	rename from active to mobile	2015-08-05 16:54:48 +02:00