l10n daemon script 362740bbfd 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-01-04 04:51:59 +01:00
..
lib	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-01-04 04:51:59 +01:00
main	Install themes to falkon subdir	2017-10-03 11:30:16 +02:00
plugins	Use correct web settings in private browsing mode	2018-01-02 22:59:17 +01:00
CMakeLists.txt	CMake buildsystem for plugins	2017-09-10 15:01:58 +02:00