No Bug -- fix Sea 2.25 by not keeping this Sea 2.26 necessary change here. r=Callek a=Callek for CLOSED TREE bustage SEA_COMM280_20140210_RELBRANCH
authorJustin Wood <Callek@gmail.com>
Tue, 11 Feb 2014 22:45:00 -0500
branchSEA_COMM280_20140210_RELBRANCH
changeset 1728 5972b25d5ccbc5bb5e709cbb8ce3943925e7adbe
parent 1723 5aca607c5dd69d6c697e10a40f3099e5b830851d
child 1729 7706ac5ed0a44f03b2df2d9eec097747d4a29d14
push id674
push userCallek@gmail.com
push dateWed, 12 Feb 2014 03:46:42 +0000
reviewersCallek, Callek
No Bug -- fix Sea 2.25 by not keeping this Sea 2.26 necessary change here. r=Callek a=Callek for CLOSED TREE bustage
moz.build
resources/locale/Makefile.in
--- a/moz.build
+++ b/moz.build
@@ -5,10 +5,8 @@
 
 DIRS += [
     'base',
     'resources',
 ]
 
 XPI_NAME = 'inspector'
 export('XPI_NAME')
-
-JAR_MANIFESTS += ['jar.mn']
--- a/resources/locale/Makefile.in
+++ b/resources/locale/Makefile.in
@@ -6,19 +6,17 @@
 
 DEPTH=../../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXTERNALLY_MANAGED_MAKE_FILE := 1
 STANDALONE_MAKEFILE := 1
-JAR_MANIFEST := $(srcdir)/jar.mn
 
 XPI_NAME               = inspector
 USE_EXTENSION_MANIFEST = 1
 NO_JAR_AUTO_REG        = 1
 
 DEFINES += -DAB_CD=$(AB_CD)
 
 # Let jar.mn do its happy-dance