l10n daemon script 57120e2d3e 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"		2024-12-16 01:37:06 +00:00
..
hellopython	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-16 01:37:06 +00:00
helloqml	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-16 01:37:06 +00:00
middleclickloader	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-16 01:37:06 +00:00
runaction	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-12-16 01:37:06 +00:00
CMakeLists.txt	Plugins: Use embedded JSON metadata for shared library plugins	2019-04-21 11:03:26 +02:00
i18n.py	Python: Port from Pyside2 to Pyside6	2023-12-07 22:08:37 +01:00