Mercurial > hg > openjdk > lambda > jaxws
changeset 459:bc2980ea3581
Merge
| author | henryjen |
|---|---|
| date | Mon, 30 Sep 2013 10:11:37 -0700 |
| parents | df5d4d016425 (diff) 86788cfc2834 (current diff) |
| children | 93337eacc525 |
| files | .hgtags .jcheck/conf |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Sep 20 10:06:31 2013 -0700 +++ b/.hgtags Mon Sep 30 10:11:37 2013 -0700 @@ -233,3 +233,4 @@ 88390df7ed2cf128298a02c5e6d978f0a603cd58 jdk8-b105 6908370afe834ff01739e8ec992d4246c74b7e6e jdk8-b106 e3c9328f75638289a342ce15fbe532f05078946e jdk8-b107 +d1ea68556fd7925a3c7078dd9f77c6ca73d5aa9e jdk8-b108
--- a/make/jprt.properties Fri Sep 20 10:06:31 2013 -0700 +++ b/make/jprt.properties Mon Sep 30 10:11:37 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 @@ -40,8 +40,8 @@ linux_i586_2.6-{product|fastdebug}, \ linux_x64_2.6-{product|fastdebug}, \ macosx_x64_10.7-{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