# HG changeset patch # User lana # Date 1385400430 28800 # Node ID 24847bd96465d1d7e0bda3e121fe7625dbabcbe3 # Parent 9937f406e27e052c7b08aafc2cd7fa321300946b# Parent 0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 Merge diff -r 9937f406e27e -r 24847bd96465 .hgtags --- a/.hgtags Tue Nov 19 14:11:59 2013 +0000 +++ b/.hgtags Mon Nov 25 09:27:10 2013 -0800 @@ -237,3 +237,5 @@ 6ba4c7cb623ec612031e05cf8bf279d8f407bd1e jdk8-b113 4f2011496393a26dcfd7b1f7787a3673ddd32599 jdk8-b114 763ada2a1d8c5962bc8c3d297e57c562d2e95338 jdk8-b115 +cbfe5da942c63ef865cab4a7159e01eff7d7fcf5 jdk8-b116 +a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117 diff -r 9937f406e27e -r 24847bd96465 make/scripts/webrev.ksh --- a/make/scripts/webrev.ksh Tue Nov 19 14:11:59 2013 +0000 +++ b/make/scripts/webrev.ksh Mon Nov 25 09:27:10 2013 -0800 @@ -27,7 +27,7 @@ # Documentation is available via 'webrev -h'. # -WEBREV_UPDATED=25.0-hg+openjdk.java.net +WEBREV_UPDATED=25.1-hg+openjdk.java.net HTML=' /dev/null + hg cat -R $hg_root --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null else $parent cat --rev $parentrev --output $olddir/$PDIR/$PF $PDIR/$PF 2>/dev/null fi