l10n daemon script cda74effe3 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"		2018-10-05 05:52:10 +02:00
..
hellopython	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-08 05:44:02 +02:00
helloqml	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-05 05:52:10 +02:00
middleclickloader	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-09-30 05:50:04 +02:00
runaction	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-08-05 05:29:00 +02:00
CMakeLists.txt	Added HelloQml Extension	2018-10-02 03:07:32 +05:30
i18n.py	Support loading translations for Python extensions	2018-02-27 12:18:26 +01:00