OpenJDK / lambda / lambda
changeset 998:c1c8b46008c1 tip
Merge
| author | henryjen |
|---|---|
| date | Mon, 11 Nov 2013 23:14:43 -0800 |
| parents | 763ada2a1d8c bb31481efc2a |
| children | |
| files | .hgtags .jcheck/conf common/autoconf/generated-configure.sh common/autoconf/spec.gmk.in common/bin/hgforest.sh common/makefiles/Main.gmk |
| diffstat | 4 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Thu Oct 31 16:24:33 2013 -0700 +++ b/.hgignore Mon Nov 11 23:14:43 2013 -0800 @@ -5,3 +5,6 @@ ^.hgtip ^.bridge2 .DS_Store +hotspot.log +^JTreport +^JTwork
--- a/.hgtags Thu Oct 31 16:24:33 2013 -0700 +++ b/.hgtags Mon Nov 11 23:14:43 2013 -0800 @@ -167,16 +167,20 @@ 661c9aae602bbd9766d12590800c90f1edd1d8dd jdk8-b43 e4f81a817447c3a4f6868f083c81c2fb1b15d44c jdk8-b44 633f2378c904c92bb922a6e19e9f62fe8eac14af jdk8-b45 +f3fc96a9b243322ad5d058911162189e3ded0e96 lambda-b45 27fa766a2298ba8347dc198f0cf85ba6618e17db jdk8-b46 1dcb4b7b9373e64e135c12fe1f8699f1f80e51e8 jdk8-b47 3f6c72d1c2a6e5c9e7d81c3dc984886678a128ad jdk8-b48 +f219811ab95916fc381a69410121e63cd6270f36 lambda-b48 c97b99424815c43818e3cc3ffcdd1a60f3198b52 jdk8-b49 2fd67618b9a3c847780ed7b9d228e862b6e2824c jdk8-b50 +cc5ead46ec895e756cb62ada8c1650f1cf6daa2a lambda-b50 57c0aee7309050b9d6cfcbd202dc704e9260b377 jdk8-b51 8d24def5ceb3b8f2e857f2e18b2804fc59eecf8d jdk8-b52 febd7ff5280067ca482faaeb9418ae88764c1a35 jdk8-b53 c1a277c6022affbc6855bdfb039511e73fbe2395 jdk8-b54 b85b44cced2406792cfb9baab1377ff03e7001d8 jdk8-b55 +115a29d4c47520c4d9d684c321a60803903080bb lambda-b56 76844579fa4b30929731115b237e477181a82394 jdk8-b56 522dfac8ca4d07c0b74025d4ac3b6e5feefbb829 jdk8-b57 9367024804874faf8e958adeb333682bab1c0c47 jdk8-b58
--- a/.jcheck/conf Thu Oct 31 16:24:33 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -project=jdk8
--- a/common/makefiles/javadoc/CORE_PKGS.gmk Thu Oct 31 16:24:33 2013 -0700 +++ b/common/makefiles/javadoc/CORE_PKGS.gmk Mon Nov 11 23:14:43 2013 -0800 @@ -1,5 +1,5 @@ # -# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it