From 279c29b62e072da39600011b37e2d331fa21c7c1 Mon Sep 17 00:00:00 2001 From: kcr Date: Fri, 6 Jan 2006 23:33:53 +0000 Subject: Merged changes between root-1_5 and exp-1_4_0-beta3 into dev-1_5 branch --- src/ConicWorld/ConicWorld.java | 2 +- src/ConicWorld/build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ConicWorld') diff --git a/src/ConicWorld/ConicWorld.java b/src/ConicWorld/ConicWorld.java index 2422a6d..2af4b3d 100644 --- a/src/ConicWorld/ConicWorld.java +++ b/src/ConicWorld/ConicWorld.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/ConicWorld/build.xml b/src/ConicWorld/build.xml index 47e5a36..4e57328 100644 --- a/src/ConicWorld/build.xml +++ b/src/ConicWorld/build.xml @@ -4,7 +4,7 @@ /* * $RCSfile$ * - * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2006 Sun Microsystems, Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions -- cgit v1.2.3