Mercurial > hg > truffle
changeset 20698:57490e455c30
Merge
author | lana |
---|---|
date | Thu, 11 Dec 2014 13:39:41 -0800 |
parents | f25953cb4e18 (diff) fbd65124cdaa (current diff) |
children | d9349fa88223 |
files | |
diffstat | 1 files changed, 1 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Dec 09 13:15:10 2014 -0800 +++ b/.hgtags Thu Dec 11 13:39:41 2014 -0800 @@ -560,3 +560,4 @@ 6bf89bfe8185747a57193efb6cec1f17ccc80414 hs25.40-b21 fc1f9b67fd8c5d5cd94ecc03569d93e7ce7fb574 jdk8u40-b17 bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22 +31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18