l10n daemon script 6765b10f8d 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"		2020-06-18 05:39:07 +02:00
..
lib	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:39:07 +02:00
main	main: Remove backtrace handler	2019-04-22 09:46:39 +02:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:39:07 +02:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-18 05:39:07 +02:00
CMakeLists.txt	Add example hellopython Python extension	2018-02-26 18:18:56 +01:00
Messages.sh	Also skip scripts in src/Messages.sh	2018-03-09 09:13:10 +01:00