l10n daemon script e83caaf467 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-03-07 05:17:30 +01:00
..
hellopython	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-04 05:19:42 +01:00
runaction	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-07 05:17:30 +01:00
CMakeLists.txt	Add RunAction extension	2018-03-03 12:57:28 +01:00
i18n.py	Support loading translations for Python extensions	2018-02-27 12:18:26 +01:00
Messages.sh	Add RunAction extension	2018-03-03 12:57:28 +01:00