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/TickTockCollision | |
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/TickTockCollision')
-rw-r--r-- | src/TickTockCollision/Box.java | 2 | ||||
-rw-r--r-- | src/TickTockCollision/CollisionDetector.java | 2 | ||||
-rw-r--r-- | src/TickTockCollision/TickTockCollision.java | 2 | ||||
-rw-r--r-- | src/TickTockCollision/build.xml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/TickTockCollision/Box.java b/src/TickTockCollision/Box.java index 98bd134..561702a 100644 --- a/src/TickTockCollision/Box.java +++ b/src/TickTockCollision/Box.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/TickTockCollision/CollisionDetector.java b/src/TickTockCollision/CollisionDetector.java index bf5c17f..515b4c4 100644 --- a/src/TickTockCollision/CollisionDetector.java +++ b/src/TickTockCollision/CollisionDetector.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/TickTockCollision/TickTockCollision.java b/src/TickTockCollision/TickTockCollision.java index 1303fb1..f6b36f6 100644 --- a/src/TickTockCollision/TickTockCollision.java +++ b/src/TickTockCollision/TickTockCollision.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/TickTockCollision/build.xml b/src/TickTockCollision/build.xml index def3da4..47e5a36 100644 --- a/src/TickTockCollision/build.xml +++ b/src/TickTockCollision/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 |