l10n daemon script aca4f6c0a9 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-05-16 05:26:16 +02:00
..
hellopython	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-16 05:26:16 +02:00
runaction	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-05-16 05:26:16 +02:00
CMakeLists.txt	Merge branch 'Falkon/3.0'	2018-03-09 18:11:56 +01:00
i18n.py	Support loading translations for Python extensions	2018-02-27 12:18:26 +01:00