l10n daemon script b25f7e07a8 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-08-27 01:49:35 +00:00
..
package	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-08-27 01:49:35 +00:00
CMakeLists.txt	Use undeprecated install dirs	2022-04-21 00:50:14 +02:00
Messages.sh	Don’t extract QML strings as Java printf strings	2021-04-06 21:09:48 +02:00