Merge

Thu, 03 Oct 2013 19:18:54 +0100

author
chegar
date
Thu, 03 Oct 2013 19:18:54 +0100
changeset 426
da8141b6e344
parent 425
d3a65e8912c9
parent 406
32edc7a2c866
child 427
2dc8ae7eb53b

Merge

     1.1 --- a/.hgtags	Sat Sep 14 20:43:34 2013 +0100
     1.2 +++ b/.hgtags	Thu Oct 03 19:18:54 2013 +0100
     1.3 @@ -229,3 +229,6 @@
     1.4  88390df7ed2cf128298a02c5e6d978f0a603cd58 jdk8-b105
     1.5  6908370afe834ff01739e8ec992d4246c74b7e6e jdk8-b106
     1.6  e3c9328f75638289a342ce15fbe532f05078946e jdk8-b107
     1.7 +d1ea68556fd7925a3c7078dd9f77c6ca73d5aa9e jdk8-b108
     1.8 +df5d4d01642572e77fd3c01e4c8703ed3f6eec87 jdk8-b109
     1.9 +cc682329886be2fc26220fc30597ee4e5bba43ed jdk8-b110
     2.1 --- a/make/jprt.properties	Sat Sep 14 20:43:34 2013 +0100
     2.2 +++ b/make/jprt.properties	Thu Oct 03 19:18:54 2013 +0100
     2.3 @@ -1,5 +1,5 @@
     2.4  #
     2.5 -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
     2.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
     2.7  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.8  #
     2.9  # This code is free software; you can redistribute it and/or modify it
    2.10 @@ -40,8 +40,8 @@
    2.11      linux_i586_2.6-{product|fastdebug},                         \
    2.12      linux_x64_2.6-{product|fastdebug},                          \
    2.13      macosx_x64_10.7-{product|fastdebug},                        \
    2.14 -    windows_i586_5.1-{product|fastdebug},                       \
    2.15 -    windows_x64_5.2-{product|fastdebug}
    2.16 +    windows_i586_6.1-{product|fastdebug},                       \
    2.17 +    windows_x64_6.1-{product|fastdebug}
    2.18  
    2.19  # Directories to be excluded from the source bundles
    2.20  jprt.bundle.exclude.src.dirs=build dist webrev

mercurial