changeset 22790:7b46afd373e1

Merge
author lana
date Mon, 29 Dec 2014 19:40:48 -0800
parents 47d2fb044efa (diff) b23970014931 (current diff)
children df4da2a16ea7
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 17 14:38:47 2014 -0800
+++ b/.hgtags	Mon Dec 29 19:40:48 2014 -0800
@@ -563,3 +563,4 @@
 31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18
 f8fc5cbe082ce0fb0c6c1dcd39493a16ed916353 hs25.40-b23
 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u40-b19
+d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00