changeset 11132:9f71e36a471a hs25-b42

Merge
author amurillo
date Thu, 18 Jul 2013 09:25:06 -0700
parents bb416ee2a79b (diff) 9d18d92e54b5 (current diff)
children 5787fac72e76
files
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jul 18 00:52:54 2013 -0400
+++ b/.hgtags	Thu Jul 18 09:25:06 2013 -0700
@@ -359,3 +359,4 @@
 c9dd82da51ed34a28f7c6b3245163ee962e94572 hs25-b40
 30b5b75c42ac5174b640fbef8aa87527668e8400 jdk8-b98
 2b9946e10587f74ef75ae8145bea484df4a2738b hs25-b41
+81b6cb70717c66375846b78bb174594ec3aa998e jdk8-b99
--- a/test/runtime/8001071/Test8001071.sh	Thu Jul 18 00:52:54 2013 -0400
+++ b/test/runtime/8001071/Test8001071.sh	Thu Jul 18 09:25:06 2013 -0700
@@ -2,21 +2,21 @@
 
 # Copyright (c) 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
 # under the terms of the GNU General Public License version 2 only, as
 # published by the Free Software Foundation.
-
+#
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # version 2 for more details (a copy is included in the LICENSE file that
 # accompanied this code).
-
+#
 # You should have received a copy of the GNU General Public License version
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
+#
 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 # or visit www.oracle.com if you need additional information or have any
 # questions.