changeset 231:3a829f5ba9d2

Merge
author lana
date Tue, 04 Jan 2011 16:28:40 -0800
parents ce7b69a2d927 57ed1f3bec72
children 64c84c62ec2a
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/build.properties	Wed Dec 22 22:57:26 2010 -0800
+++ b/build.properties	Tue Jan 04 16:28:40 2011 -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/make/Makefile	Wed Dec 22 22:57:26 2010 -0800
+++ b/make/Makefile	Tue Jan 04 16:28:40 2011 -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