# HG changeset patch
# User dholmes
# Date 1413941950 14400
# Node ID faa174d8bd6871576672705e541c6aae0c3b3c89
# Parent  2e76a06cb4316d10e4d1d2e7e7c73efd204d5aca# Parent  2ffefbac794be27e0c60d7e5f2cb598f04ec2411
Merge

diff -r 2e76a06cb431 -r faa174d8bd68 .hgtags
--- a/.hgtags	Thu Oct 16 20:31:43 2014 -0400
+++ b/.hgtags	Tue Oct 21 21:39:10 2014 -0400
@@ -314,6 +314,25 @@
 1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b24
 1710841b0229403f4af85eac8b68ea5065a26c81 jdk8u20-b25
 d1a7ea2c3e1091e0df1285963328a96f475f240d jdk8u20-b26
+97c6d6a8e5bb3dfc24b9a32711aa0906ea110e23 jdk8u25-b00
+c4cfb4376f5916c5d7eb1f39a0e23402de0d9818 jdk8u25-b01
+b4d29a751077e5500e766b8104dd1cb7148a550f jdk8u25-b02
+d3df54be114a5c41d4881b61cd42fbb0e52aaf4a jdk8u25-b03
+64e7567a8539078a678853a384340eee469168b0 jdk8u25-b04
+6de13ae93be20b97f53e3837739947d59fb4fd65 jdk8u25-b05
+69d17ee59c0e77033aca293501a642d0abc20c85 jdk8u25-b06
+561d066eaa6428088b4f7e273a8caed90e8f6073 jdk8u25-b07
+c2a5ad21d01c5d921c4e928edcb14cc3d61eb62b jdk8u25-b08
+1249614d7f1d9bf8443f0abd0622b4d2a3ab0638 jdk8u25-b09
+0c5d41165be3f4bb989bd84283c2df3e37b9845d jdk8u25-b10
+cc5ab3e0fe815ae80bb52fa5affcb35ee0f51cff jdk8u25-b11
+c35e73e4acd8ed03e77e8e20023bac115c7dfe38 jdk8u25-b12
+5d990a43c996ef039c6619e55215d589e09d1022 jdk8u25-b13
+4429ea47ee6eca6b8a1dbda1950566ee821ba19d jdk8u25-b14
+09eaef69f384ecf8ec0342b87a8b150740941140 jdk8u25-b15
+f0a48c214c46b7351ff8e6d6b6dc533463a4be21 jdk8u25-b16
+d117f01bfb4f34668ac216c9837e88acead14dce jdk8u25-b17
+efac90a2da447c2b2d43ee1b1e20c0828659f9c5 jdk8u25-b18
 0dccc4aca1859b1ff7dca9db214f7f38c4ddbbce jdk8u40-b00
 f8736a40a35df0c8055c8a94b96e5381b381ad33 jdk8u40-b01
 b6a148730f2b14193c308bc9c866c36ee6c08ed3 jdk8u40-b02
@@ -324,3 +343,4 @@
 cf9afcfcb7a41b892fc896c1dbf245d5dcc42395 jdk8u40-b07
 515a912fb5a9a61774fa2afa10f4472589be5602 jdk8u40-b08
 0958d0a9f44efcebe30b17b07240abaa42a2112b jdk8u40-b09
+1053aeab6b12d5cd4e063bf9ee37f20811450084 jdk8u40-b10
diff -r 2e76a06cb431 -r faa174d8bd68 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Thu Oct 16 20:31:43 2014 -0400
+++ b/common/autoconf/generated-configure.sh	Tue Oct 21 21:39:10 2014 -0400
@@ -3868,7 +3868,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1405022087
+DATE_WHEN_GENERATED=1411155242
 
 ###############################################################################
 #
diff -r 2e76a06cb431 -r faa174d8bd68 make/Jprt.gmk
--- a/make/Jprt.gmk	Thu Oct 16 20:31:43 2014 -0400
+++ b/make/Jprt.gmk	Tue Oct 21 21:39:10 2014 -0400
@@ -25,6 +25,9 @@
 
 # This file is contains targets utilities needed by JPRT.
 
+          ifdef ALT_BSDIFF_DIR
+	    @$(ECHO) " --with-bsdiff-dir=$(call UnixPath,$(ALT_BSDIFF_DIR)) " >> $@.tmp
+          endif
 ifndef JPRT_ARCHIVE_BUNDLE
   JPRT_ARCHIVE_BUNDLE=/tmp/jprt_bundles/j2sdk-image.zip
 endif
diff -r 2e76a06cb431 -r faa174d8bd68 make/jprt.properties