l10n daemon script c1cd23993c 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"		2022-04-18 02:43:43 +00:00
..
lib	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-18 02:43:43 +00:00
main	Stop installing app icon in pixmaps location	2021-05-16 21:14:08 +02:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-03-05 01:43:20 +00:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-04-17 02:59:00 +00: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