l10n daemon script b5ab505074 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-02 02:03:13 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-02-02 02:03:13 +00:00
CMakeLists.txt	Adapt build system to also support Qt 6	2022-10-29 16:51:41 +02:00
Messages.sh	Don’t extract QML strings as Java printf strings	2021-04-06 21:09:48 +02:00