l10n daemon script f838f02db1 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-06 05:24:12 +01:00
..
lib	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-04 05:19:42 +01:00
main	Fix installing translations	2018-03-02 16:43:31 +01:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-06 05:24:12 +01:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-03-06 05:24:12 +01:00
CMakeLists.txt	Add example hellopython Python extension	2018-02-26 18:18:56 +01:00
Messages.sh	gettext translations: extract them and use ECM to load them	2018-02-25 00:27:41 +01:00