changeset 53:8e669ea7a213

Merge
author ohair
date Thu, 23 Dec 2010 16:20:55 -0800
parents 26d81b7cb87a 4ad9a782dab5
children 66a6e7d96577
files
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/build-defs.xml	Thu Dec 23 16:18:47 2010 -0800
+++ b/build-defs.xml	Thu Dec 23 16:20:55 2010 -0800
@@ -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	Thu Dec 23 16:18:47 2010 -0800
+++ b/build-drop-template.xml	Thu Dec 23 16:20:55 2010 -0800
@@ -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.properties	Thu Dec 23 16:18:47 2010 -0800
+++ b/build.properties	Thu Dec 23 16:20:55 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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	Thu Dec 23 16:18:47 2010 -0800
+++ b/build.xml	Thu Dec 23 16:20:55 2010 -0800
@@ -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/make/Makefile	Thu Dec 23 16:18:47 2010 -0800
+++ b/make/Makefile	Thu Dec 23 16:20:55 2010 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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