l10n daemon script 9ef28fffec 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"		2023-02-20 02:01:39 +00:00
..
android	Export main activity as required by Android 12	2023-01-20 15:07:02 +00:00
app	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-02-20 02:01:39 +00:00
components	Port tests away from QQC1	2022-08-05 16:12:02 +02:00
CMakeLists.txt	rename from active to mobile	2015-08-05 16:54:48 +02:00