Merge

Tue, 17 Mar 2015 12:14:01 -0700

author
asaha
date
Tue, 17 Mar 2015 12:14:01 -0700
changeset 2778
41a4ec83fcea
parent 2770
1261fefe0f5e
parent 2777
847af465a542
child 2779
b9e5fab44d53

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Thu Feb 26 10:57:21 2015 -0800
     1.2 +++ b/.hgtags	Tue Mar 17 12:14:01 2015 -0700
     1.3 @@ -378,6 +378,8 @@
     1.4  fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23
     1.5  c5d4ffa220f3824c2ea5d39dc99d41a9df9e5ae5 jdk8u40-b24
     1.6  991141080b2078e67179ff307a5051e59431762c jdk8u40-b25
     1.7 +2904142783dd0a9e12195a84c7dcdb3d8278b1b1 jdk8u40-b26
     1.8 +83eca922346e27ec42645e9630c04fbaec5eaf0f jdk8u40-b27
     1.9  dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00
    1.10  244e6dc772877dfae6286530f58e11a210a48a3c jdk8u45-b01
    1.11  401ec76887623a29d3f868f9f9b18b42838d2e92 jdk8u45-b02
    1.12 @@ -388,6 +390,10 @@
    1.13  460238ab73ce27112b3d0d7236366960f9898259 jdk8u45-b07
    1.14  6dd7fd9f027bf037517feae2a571848aa8fbc20f jdk8u45-b08
    1.15  db16aa5c73c99d0050246660ebebb6166002ff57 jdk8u45-b09
    1.16 +572895f19937b7aadc8c27c5e83887bf40f5bcff jdk8u45-b10
    1.17 +0547ef2be3b303923b30ce78e1ab832725483f4e jdk8u45-b11
    1.18 +4f89bbda7b4532b9f6eeee8c41b7a3b38570ae93 jdk8u45-b12
    1.19 +5ce022bca792453a7efedaed419a9d763d7a9fc3 jdk8u45-b13
    1.20  0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u60-b00
    1.21  0ba07c272e33c93377a5d7ed98b9de873cc91980 jdk8u60-b01
    1.22  387cf62ce7895dd5e067aaa51faa93d5c078583e jdk8u60-b02
     2.1 --- a/THIRD_PARTY_README	Thu Feb 26 10:57:21 2015 -0800
     2.2 +++ b/THIRD_PARTY_README	Tue Mar 17 12:14:01 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