l10n daemon script aca5cb0e1c 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-07-19 05:21:21 +02:00
..
lib	Merge branch 'Falkon/3.0'	2018-07-08 21:05:36 +02:00
main	Fix location of Info.plist file for macOS build	2018-06-27 17:41:44 +02:00
plugins	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-07 06:57:28 +02:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-19 05:21:21 +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