diff --git a/.mozconfig.mk b/.mozconfig.mk index 7f871989..f5788ca5 100644 --- a/.mozconfig.mk +++ b/.mozconfig.mk @@ -17,4 +17,4 @@ MOZ_OBJDIR=/c/projects/moz95/obj-sm95-release # --enable-extensions=default,tasks is used by configure (not client.mk) # --enable-crypto is used by configure (not client.mk) # --enable-svg is used by configure (not client.mk) -# --enable-canvas is used by configure (not client.mk) +# --enable-canvas is used by configure (not client.mk) \ No newline at end of file diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index 68539382..411cf850 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -131,7 +131,7 @@ DEFINES += -DNSS_ENABLE_ECC # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's -LOCAL_INCLUDES += $(NSS_CFLAGS) +LOCAL_INCLUDES += $(NSS_CFLAGS) -DFORCE_PR_LOG -DPR_LOGGING=1 EXTRA_DSO_LDOPTS += \ $(MOZ_UNICHARUTIL_LIBS) \ diff --git a/xpfe/global/resources/content/aboutCredits.html b/xpfe/global/resources/content/aboutCredits.html index a216ccde..11e06227 100644 --- a/xpfe/global/resources/content/aboutCredits.html +++ b/xpfe/global/resources/content/aboutCredits.html @@ -33,6 +33,7 @@