Mercurial > hg > openjdk > lambda > corba
changeset 559:088257d3dda0
Merge
| author | henryjen |
|---|---|
| date | Mon, 30 Sep 2013 10:11:02 -0700 |
| parents | 428428cf5e06 (diff) f53b9b550f62 (current diff) |
| children | 356aaedbbe57 |
| files | .hgtags .jcheck/conf |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 20 10:06:53 2013 -0700 +++ b/.hgtags Mon Sep 30 10:11:02 2013 -0700 @@ -233,3 +233,4 @@ 4e38de7c767e34104fa147b5b346d9fe6b731279 jdk8-b105 2e3a056c84a71eba78945c18b05397858ffd7ad0 jdk8-b106 23fc34133152692b725db4bd617b4c8dfd6ccb05 jdk8-b107 +a4bb3b4500164748a9c33b2283cfda76d89f25ab jdk8-b108
--- a/make/jprt.properties Fri Sep 20 10:06:53 2013 -0700 +++ b/make/jprt.properties Mon Sep 30 10:11:02 2013 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2013, 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 @@ -39,8 +39,8 @@ solaris_x64_5.10-{product|fastdebug}, \ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ - windows_i586_5.1-{product|fastdebug}, \ - windows_x64_5.2-{product|fastdebug} + windows_i586_6.1-{product|fastdebug}, \ + windows_x64_6.1-{product|fastdebug} # Directories to be excluded from the source bundles jprt.bundle.exclude.src.dirs=build dist webrev