Mercurial > hg > openjdk > jdk8 > jaxws
changeset 425:da8141b6e344
Merge
author | chegar |
---|---|
date | Thu, 03 Oct 2013 19:18:54 +0100 |
parents | d3a65e8912c9 (current diff) 32edc7a2c866 (diff) |
children | 2dc8ae7eb53b |
files | |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Sep 14 20:43:34 2013 +0100 +++ b/.hgtags Thu Oct 03 19:18:54 2013 +0100 @@ -229,3 +229,6 @@ 88390df7ed2cf128298a02c5e6d978f0a603cd58 jdk8-b105 6908370afe834ff01739e8ec992d4246c74b7e6e jdk8-b106 e3c9328f75638289a342ce15fbe532f05078946e jdk8-b107 +d1ea68556fd7925a3c7078dd9f77c6ca73d5aa9e jdk8-b108 +df5d4d01642572e77fd3c01e4c8703ed3f6eec87 jdk8-b109 +cc682329886be2fc26220fc30597ee4e5bba43ed jdk8-b110
--- a/make/jprt.properties Sat Sep 14 20:43:34 2013 +0100 +++ b/make/jprt.properties Thu Oct 03 19:18:54 2013 +0100 @@ -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