Merge

Thu, 30 Jan 2014 14:41:17 -0800

author
asaha
date
Thu, 30 Jan 2014 14:41:17 -0800
changeset 795
5edde74a778b
parent 794
dd4cc4ce2745
parent 728
7dfde83426d1
child 796
2d9af8fd30cd

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jan 28 14:56:59 2014 -0800
     1.2 +++ b/.hgtags	Thu Jan 30 14:41:17 2014 -0800
     1.3 @@ -236,6 +236,7 @@
     1.4  7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b124
     1.5  7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b125
     1.6  095263db862da23fa04d57c7e93e553831132449 jdk8-b126
     1.7 +fdfbb745caf0e54775a44e66e39d3025785e0528 jdk8-b127
     1.8  13ca8f1a9eba716295fb7d9c2ddad81390931919 jdk8u5-b01
     1.9  7e7cb9977a3d1244384ffa454a4890764a07b042 jdk8u5-b02
    1.10  2abeb654b57f306f73f3f73bdfa05f93bce2a1f3 jdk8u5-b03
     2.1 --- a/THIRD_PARTY_README	Tue Jan 28 14:56:59 2014 -0800
     2.2 +++ b/THIRD_PARTY_README	Thu Jan 30 14:41:17 2014 -0800
     2.3 @@ -1400,7 +1400,7 @@
     2.4  -------------------------------------------------------------------------------
     2.5  
     2.6  %% This notice is provided with respect to Little CMS 2.4, which may be 
     2.7 -included with OpenJDK 8.
     2.8 +included with JRE 8, JDK 8, and OpenJDK 8.
     2.9  
    2.10  --- begin of LICENSE ---
    2.11  

mercurial