Merge

Mon, 14 Oct 2013 18:53:53 -0400

author
jqzuo
date
Mon, 14 Oct 2013 18:53:53 -0400
changeset 837
7deff16cf438
parent 819
3ece65f23ed2
parent 836
00ae95ca1755
child 841
547316ea137d

Merge

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
     1.1 --- a/make/install-rules.gmk	Fri Oct 11 00:06:56 2013 -0700
     1.2 +++ b/make/install-rules.gmk	Mon Oct 14 18:53:53 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  

mercurial