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

This commit is contained in:
Roy Tam 2020-05-02 09:19:25 +08:00
commit 1453f13d33
440 changed files with 4353 additions and 3378 deletions

View file

@ -104,6 +104,11 @@ MOZ_PKG_MAC_ICON=branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif
NON_OMNIJAR_FILES = \
defaults/profile/chrome/userChrome-example.css \
defaults/profile/chrome/userContent-example.css \
$(NULL)
ifndef LIBXUL_SDK
INSTALL_SDK = 1
endif