Mercurial > hg > openjdk > jdk8 > jaxp
changeset 559:5e6bf44f3b7d
Merge
author | chegar |
---|---|
date | Thu, 03 Oct 2013 19:18:50 +0100 |
parents | 0ce80229af71 (current diff) 17ee0d3e97fd (diff) |
children | 54a0dd196acd |
files | |
diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Sep 14 20:43:00 2013 +0100 +++ b/.hgtags Thu Oct 03 19:18:50 2013 +0100 @@ -229,3 +229,6 @@ 09a46ec11f880154886c70be03aff5ab2ddf0ab7 jdk8-b105 d3be8e3b429df917e72c1c23e7920c651219b587 jdk8-b106 d6a32e3831aab20a9a3bc78cdc0a60aaad725c6c jdk8-b107 +8ade3eed63da87067a7137c111f684a821e9e531 jdk8-b108 +02bfab2aa93899e0f02584f1e85537485a196553 jdk8-b109 +4c84c5b447b09aff27f3b72667ab3a5401e85968 jdk8-b110
--- a/make/jprt.properties Sat Sep 14 20:43:00 2013 +0100 +++ b/make/jprt.properties Thu Oct 03 19:18:50 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 @@ -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