Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2020-03-13 11:09:23 +08:00
commit 9d612014f8
80 changed files with 1267 additions and 1198 deletions

View file

@ -19,7 +19,10 @@ if CONFIG['LIBXUL_SDK']:
SOURCES += ['nsBrowserApp.cpp']
FINAL_TARGET_FILES += ['blocklist.xml']
FINAL_TARGET_FILES += [
'blocklist.xml',
'ua-update.json'
]
FINAL_TARGET_FILES.defaults += ['permissions']
FINAL_TARGET_FILES.defaults.profile += ['profile/prefs.js']

View file

@ -0,0 +1 @@
{}