Merge

Wed, 07 Oct 2015 08:33:19 -0700

author
asaha
date
Wed, 07 Oct 2015 08:33:19 -0700
changeset 1576
0e00ce7ff8cb
parent 1571
9891047b8e70
parent 1575
a482cd45f31d
child 1577
a335b6d20341

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Oct 06 11:01:17 2015 -0700
     1.2 +++ b/.hgtags	Wed Oct 07 08:33:19 2015 -0700
     1.3 @@ -473,6 +473,7 @@
     1.4  0787e2c3160eeaea4183bcc9e3ffbd7adbe0d345 jdk8u65-b14
     1.5  3b1c03ea5649b2e317f327c0b4d949d49504a591 jdk8u65-b15
     1.6  170b44557b27ba97d12f45e2b94b7709a1bf8b54 jdk8u65-b16
     1.7 +c684352da3e3c0df6a219796019142748d593fe5 jdk8u65-b17
     1.8  01bb22b4ebb6348efa14726ba139858d6defefcd jdk8u66-b00
     1.9  0ca005b45d10fc8b93852670136a3992038c3722 jdk8u66-b01
    1.10  dc132a110960e6b9feff81f0616f7a40a97f3f0f jdk8u66-b02
    1.11 @@ -486,5 +487,6 @@
    1.12  b5c54b2e12c3fbc54c7d7e0f22187fa601feb749 jdk8u66-b14
    1.13  d45e1dc28a6ee6fd03348ee170d9895957888124 jdk8u66-b15
    1.14  5f29f2da7993f09564f6a5cb34e2799981ea96bb jdk8u66-b16
    1.15 +6eab3ce957aa560f8f9080a2c9535d1ee70fc834 jdk8u66-b17
    1.16  31a6e29ec33a9a3c6ac13ce66d3b96196700841c jdk8u72-b00
    1.17  d0afaafe3790d446d24ca35ddf61380457362b39 jdk8u72-b01
     2.1 --- a/common/autoconf/generated-configure.sh	Tue Oct 06 11:01:17 2015 -0700
     2.2 +++ b/common/autoconf/generated-configure.sh	Wed Oct 07 08:33:19 2015 -0700
     2.3 @@ -3879,7 +3879,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1433258489
     2.8 +DATE_WHEN_GENERATED=1444076935
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -11295,7 +11295,7 @@
    2.13    fi
    2.14  
    2.15  
    2.16 -# The cooked update version used to encode trailing letters in the update
    2.17 +  # The cooked update version used to encode trailing letters in the update
    2.18    # version into a trailing number. That is no longer needed, but need to
    2.19    # keep the format in 8u for compatibility.
    2.20    COOKED_JDK_UPDATE_VERSION="${JDK_UPDATE_VERSION}0"

mercurial