# HG changeset patch
# User pbhat
# Date 1380808341 14400
# Node ID 76831144a6cc4c8b7e220356f1d55566948af8d6
# Parent  b5d2bf482a3ea1cca08c994512804ffbc73de0a1# Parent  7c163aa2962e501284157685cd1652c558bbb8f3
Merge

diff -r b5d2bf482a3e -r 76831144a6cc common/autoconf/generated-configure.sh
diff -r b5d2bf482a3e -r 76831144a6cc make/install-rules.gmk
--- a/make/install-rules.gmk	Wed Jul 05 19:14:19 2017 +0200
+++ b/make/install-rules.gmk	Thu Oct 03 09:52:21 2013 -0400
@@ -96,7 +96,6 @@
 combo_build:
 	@$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'`
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all
-	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo
 	$(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all