Thu, 03 Oct 2013 09:52:21 -0400
Merge
1.1 --- a/make/install-rules.gmk Wed Oct 02 15:08:03 2013 +0200 1.2 +++ b/make/install-rules.gmk Thu Oct 03 09:52:21 2013 -0400 1.3 @@ -96,7 +96,6 @@ 1.4 combo_build: 1.5 @$(ECHO) $@ installer combo build started: `$(DATE) '+%y-%m-%d %H:%M'` 1.6 $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.jreboth ; $(MAKE) all 1.7 - $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/wrapper/wrapper.new64jre ; $(MAKE) all 1.8 $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/ishield/jre ; $(MAKE) au_combo 1.9 $(CD) $(INSTALL_TOPDIR)/make/installer/bundles/windows/xmlinffile ; $(MAKE) all 1.10