merge MarinaFleet and Marina
authorAdam Megacz <adam@megacz.com>
Fri, 20 Nov 2009 06:42:42 +0000 (22:42 -0800)
committerAdam Megacz <adam@megacz.com>
Fri, 20 Nov 2009 06:42:42 +0000 (22:42 -0800)
commit836b25222d4573f6b8a7b31c12c6877bdf2f7c34
tree0b95f3473cfeb4619e66d23cf033d9ebdca84f63
parentc345d2335f3d7a5b8f9316a3fd62608c5d3e151e
merge MarinaFleet and Marina
src/edu/berkeley/fleet/marina/Marina.java
src/edu/berkeley/fleet/marina/MarinaDestination.java
src/edu/berkeley/fleet/marina/MarinaFleet.java [deleted file]
src/edu/berkeley/fleet/marina/MarinaPath.java
src/edu/berkeley/fleet/marina/MarinaShip.java