Merge

Tue, 17 Mar 2015 12:06:08 -0700

author
asaha
date
Tue, 17 Mar 2015 12:06:08 -0700
changeset 825
949f2f7f879f
parent 817
bba10054d51c
parent 824
bad02ac45d59
child 826
c56d9ab25cd2

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Feb 26 10:51:27 2015 -0800
     1.2 +++ b/.hgtags	Tue Mar 17 12:06:08 2015 -0700
     1.3 @@ -378,6 +378,8 @@
     1.4  b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
     1.5  5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
     1.6  b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
     1.7 +1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26
     1.8 +a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27
     1.9  667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
    1.10  cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
    1.11  855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02
    1.12 @@ -388,6 +390,10 @@
    1.13  145ea6d2899f5cc6bd4e1108903e4d22ad063eca jdk8u45-b07
    1.14  f3d678fe58e7c026fb62be8b72c46ce1015aadf6 jdk8u45-b08
    1.15  8f2e5110151810dc5b56a3ce05d955e400bee937 jdk8u45-b09
    1.16 +5cf887e3e1368d1910181eaab2794b25058fe8b6 jdk8u45-b10
    1.17 +855fd9dfcbee177b508413dbab6e46b57dd367c4 jdk8u45-b11
    1.18 +3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12
    1.19 +15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13
    1.20  c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
    1.21  7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
    1.22  5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
     2.1 --- a/THIRD_PARTY_README	Thu Feb 26 10:51:27 2015 -0800
     2.2 +++ b/THIRD_PARTY_README	Tue Mar 17 12:06:08 2015 -0700
     2.3 @@ -1250,7 +1250,7 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to libpng 1.5.4, which may be 
     2.8 +%% This notice is provided with respect to libpng 1.6.16, which may be
     2.9  included with JRE 8, JDK 8, and OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1266,8 +1266,8 @@
    2.13  
    2.14  This code is released under the libpng license.
    2.15  
    2.16 -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
    2.17 -Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
    2.18 +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
    2.19 +Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
    2.20  distributed according to the same disclaimer and license as libpng-1.2.5
    2.21  with the following individual added to the list of Contributing Authors
    2.22  
    2.23 @@ -1364,7 +1364,7 @@
    2.24  
    2.25  Glenn Randers-Pehrson
    2.26  glennrp at users.sourceforge.net
    2.27 -July 7, 2011
    2.28 +December 22, 2014
    2.29  
    2.30  --- end of LICENSE ---
    2.31  

mercurial