No Bug -- fix Sea 2.25 by not keeping this Sea 2.26 necessary change here. r=Callek a=Callek for CLOSED TREE bustage SEA2_25_RELBRANCH SEAMONKEY_2_25_BUILD1 SEAMONKEY_2_25_RELEASE SEAMONKEY_2_25b2_BUILD1 SEAMONKEY_2_25b2_RELEASE SEAMONKEY_2_25b3_BUILD1 SEAMONKEY_2_25b3_RELEASE
authorJustin Wood <Callek@gmail.com>
Tue, 11 Feb 2014 22:44:59 -0500
branchSEA2_25_RELBRANCH
changeset 1727 1c6b874b1fd9956c7081e00c08c14df54ad1e529
parent 1723 5aca607c5dd69d6c697e10a40f3099e5b830851d
child 1731 ba65397f7e6602e791e969a42ee157220acca123
child 1733 11513fea174d77adc3afece0a6f5436776d603a7
child 1735 0b50c2789af3fe483249fdb5f240575e7cfa2208
child 1737 94294452721f03b310794eb2986b9500ac51e43d
child 1739 7787723f7eee4abb5a8234818c80f7edd8a065c2
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