changeset 114:667e270f53cf

Merge
author ohair
date Wed, 16 Feb 2011 14:21:22 -0800
parents 8beac006c96c 38d07d25ab65
children eafc26d73d9d
files
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/build.xml	Wed Feb 16 13:27:06 2011 -0800
+++ b/make/build.xml	Wed Feb 16 14:21:22 2011 -0800
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- 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/src/share/bin/launcher.sh-template	Wed Feb 16 13:27:06 2011 -0800
+++ b/src/share/bin/launcher.sh-template	Wed Feb 16 14:21:22 2011 -0800
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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/test/tools/javac/T5090006/compiler.sh	Wed Feb 16 13:27:06 2011 -0800
+++ b/test/tools/javac/T5090006/compiler.sh	Wed Feb 16 14:21:22 2011 -0800
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 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