diff options
author | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2005-02-18 23:25:59 +0000 |
---|---|---|
committer | kcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300> | 2005-02-18 23:25:59 +0000 |
commit | 1f03bfbb94702b2f08df62308dfc97416880c716 (patch) | |
tree | 51ea830e4eff52d12dd3870e2c44ba0a721f2a89 /src/Morphing | |
parent | bf7fd8076debc3fe2b23c2c399c5ce13afb3198e (diff) |
Merged changes between 1.3.2-beta2 and 1.3.2-beta3 into the 1.4 dev 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 74758fb..c61644d 100644 --- a/src/Morphing/ColorCube.java +++ b/src/Morphing/ColorCube.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 280b3fb..96c8f09 100644 --- a/src/Morphing/ColorPyramidDown.java +++ b/src/Morphing/ColorPyramidDown.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 4cca260..b43ddd9 100644 --- a/src/Morphing/ColorPyramidUp.java +++ b/src/Morphing/ColorPyramidUp.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 326f78c..182ac87 100644 --- a/src/Morphing/Morphing.java +++ b/src/Morphing/Morphing.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 730434c..3780fac 100644 --- a/src/Morphing/MorphingBehavior.java +++ b/src/Morphing/MorphingBehavior.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 9d3858c..a9da9ce 100644 --- a/src/Morphing/Pyramid2Cube.java +++ b/src/Morphing/Pyramid2Cube.java @@ -1,7 +1,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 def3da4..47e5a36 100644 --- a/src/Morphing/build.xml +++ b/src/Morphing/build.xml @@ -4,7 +4,7 @@ /* * $RCSfile$ * - * Copyright (c) 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2005 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 |