diff options
| author | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2006-01-06 23:33:53 +0000 |
|---|---|---|
| committer | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2006-01-06 23:33:53 +0000 |
| commit | 279c29b62e072da39600011b37e2d331fa21c7c1 (patch) | |
| tree | d6c425de568e8b6b952697e4bc2ab4fd749170eb /src/Morphing | |
| parent | ed3fe3394103b0eddedde55fcb954079a5b42e8a (diff) | |
Merged changes between root-1_5 and exp-1_4_0-beta3 into dev-1_5 branch
Diffstat (limited to 'src/Morphing')
| -rw-r--r-- | src/Morphing/ColorCube.java | 2 | ||||
| -rw-r--r-- | src/Morphing/ColorPyramidDown.java | 2 | ||||
| -rw-r--r-- | src/Morphing/ColorPyramidUp.java | 2 | ||||
| -rw-r--r-- | src/Morphing/Morphing.java | 2 | ||||
| -rw-r--r-- | src/Morphing/MorphingBehavior.java | 2 | ||||
| -rw-r--r-- | src/Morphing/Pyramid2Cube.java | 2 | ||||
| -rw-r--r-- | src/Morphing/build.xml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/Morphing/ColorCube.java b/src/Morphing/ColorCube.java index c61644d..ff52c48 100644 --- a/src/Morphing/ColorCube.java +++ b/src/Morphing/ColorCube.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/Morphing/ColorPyramidDown.java b/src/Morphing/ColorPyramidDown.java index 96c8f09..80a572d 100644 --- a/src/Morphing/ColorPyramidDown.java +++ b/src/Morphing/ColorPyramidDown.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/Morphing/ColorPyramidUp.java b/src/Morphing/ColorPyramidUp.java index b43ddd9..e952fe2 100644 --- a/src/Morphing/ColorPyramidUp.java +++ b/src/Morphing/ColorPyramidUp.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/Morphing/Morphing.java b/src/Morphing/Morphing.java index 182ac87..3811b07 100644 --- a/src/Morphing/Morphing.java +++ b/src/Morphing/Morphing.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/Morphing/MorphingBehavior.java b/src/Morphing/MorphingBehavior.java index 3780fac..5da6eeb 100644 --- a/src/Morphing/MorphingBehavior.java +++ b/src/Morphing/MorphingBehavior.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/Morphing/Pyramid2Cube.java b/src/Morphing/Pyramid2Cube.java index a9da9ce..904d1dd 100644 --- a/src/Morphing/Pyramid2Cube.java +++ b/src/Morphing/Pyramid2Cube.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/Morphing/build.xml b/src/Morphing/build.xml index 47e5a36..4e57328 100644 --- a/src/Morphing/build.xml +++ b/src/Morphing/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 |