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

@ -59,7 +59,6 @@
#ifdef XP_WIN32
@BINPATH@/uninstall/helper.exe
#endif
@RESPATH@/update.locale
#ifdef MOZ_UPDATER
@RESPATH@/updater.ini
#endif
@ -134,6 +133,7 @@
@BINPATH@/@DLL_PREFIX@mozavcodec@DLL_SUFFIX@
#endif
@RESPATH@/browser/blocklist.xml
@RESPATH@/browser/ua-update.json
#ifdef XP_UNIX
#ifndef XP_MACOSX
@RESPATH@/run-mozilla.sh