l10n daemon script f4211e0431 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"		2021-04-22 01:12:28 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-04-22 01:12:28 +00:00
CMakeLists.txt	Move declarativeplugin to top-level dir	2018-08-03 02:24:58 +02:00
Messages.sh	Don’t extract QML strings as Java printf strings	2021-04-06 21:09:48 +02:00