commit 0acac9dcb78322b77bc16c17802968db8ad668b8 Author: Georg Koppen gk@torproject.org Date: Thu Jul 2 07:16:27 2015 +0000

fixup! TB3: Tor Browser's official .mozconfigs.

Remove old .mozconfig cruft --- .mozconfig | 1 - .mozconfig-mingw | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.mozconfig b/.mozconfig index 12c50f3..eb36301 100755 --- a/.mozconfig +++ b/.mozconfig @@ -2,7 +2,6 @@

mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1

diff --git a/.mozconfig-mingw b/.mozconfig-mingw index dddf07d..392a910 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -1,12 +1,10 @@ -#Specify the cross compile -export CROSS_COMPILE=1 +CROSS_COMPILE=1

ac_add_options --enable-application=browser ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-mingw mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" -mk_add_options MOZ_MAKE_FLAGS="-j4" mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1