changeset 264:540fbb4c414c

Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Sat, 16 Apr 2011 20:10:13 -0700
parents 237e470c4072 28c7c0ed2444
children 589e1ca5cb37
files
diffstat 6 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Apr 09 10:10:27 2011 -0700
+++ b/.hgtags	Sat Apr 16 20:10:13 2011 -0700
@@ -112,3 +112,4 @@
 4aa9916693dc1078580c1865e6f2584046851e5a jdk7-b135
 1759daa85d33800bd578853f9531f9de73f70fc7 jdk7-b136
 1d87f7460cde7f8f30af668490f82b52b879bfd8 jdk7-b137
+be3758943770a0a3dd4be6a1cb4063507c4d7062 jdk7-b138
--- a/build-defs.xml	Sat Apr 09 10:10:27 2011 -0700
+++ b/build-defs.xml	Sat Apr 16 20:10:13 2011 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, 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
--- a/build-drop-template.xml	Sat Apr 09 10:10:27 2011 -0700
+++ b/build-drop-template.xml	Sat Apr 16 20:10:13 2011 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, 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
--- a/build.xml	Sat Apr 09 10:10:27 2011 -0700
+++ b/build.xml	Sat Apr 16 20:10:13 2011 -0700
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, 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
--- a/jaxp.properties	Sat Apr 09 10:10:27 2011 -0700
+++ b/jaxp.properties	Sat Apr 16 20:10:13 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
--- a/make/Makefile	Sat Apr 09 10:10:27 2011 -0700
+++ b/make/Makefile	Sat Apr 16 20:10:13 2011 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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