Merge
authorohair
Tue, 12 Apr 2011 18:36:42 -0700
changeset 9064 63c8767f5915
parent 9062 f2aa777351f4 (current diff)
parent 9063 937a014028a6 (diff)
child 9065 0d012e044dd6
Merge
--- a/jaxws/build-defs.xml	Thu Apr 07 15:21:04 2011 -0700
+++ b/jaxws/build-defs.xml	Tue Apr 12 18:36:42 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/jaxws/build-drop-template.xml	Thu Apr 07 15:21:04 2011 -0700
+++ b/jaxws/build-drop-template.xml	Tue Apr 12 18:36:42 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/jaxws/build.xml	Thu Apr 07 15:21:04 2011 -0700
+++ b/jaxws/build.xml	Tue Apr 12 18:36:42 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/jaxws/make/Makefile	Thu Apr 07 15:21:04 2011 -0700
+++ b/jaxws/make/Makefile	Tue Apr 12 18:36:42 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