l10n daemon script 804cadfb53 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"		2022-09-18 01:41:53 +00:00
..
android	Update AndroidManifest according to Qt template	2020-12-22 09:11:54 -03:00
app	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-09-18 01:41:53 +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