[OpenGS-svn] SF.net SVN: opengs:[812] branches/newsave/src

[<sto...@us...>]

Revision: 812
          http://opengs.svn.sourceforge.net/opengs/?rev=812&view=rev
Author:   storchaka
Date:     2010-07-09 20:42:32 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
Merge with trunk

Modified Paths:
--------------
    branches/newsave/src/objects/Galaxy.java
    branches/newsave/src/objects/Race.java
    branches/newsave/src/objects/battle/Battle.java
    branches/newsave/src/objects/battle/BattleRace.java
    branches/newsave/src/objects/battle/StandartBattleGenerator.java
    branches/newsave/src/objects/geom/CircleMapGeometry.java
    branches/newsave/src/objects/io/OldGalaxyInput.java
    branches/newsave/src/objects/io/OldGalaxyOutput.java
    branches/newsave/src/objects/io/XmlGalaxyInput.java
    branches/newsave/src/objects/io/XmlGalaxyOutput.java
    branches/newsave/src/objects/production/CAP_Production.java
    branches/newsave/src/objects/production/MAT_Production.java
    branches/newsave/src/server/OGSserver.java
    branches/newsave/src/server/commands/AbstractServerCommand.java
    branches/newsave/src/server/commands/CreateNewGame.java
    branches/newsave/src/server/commands/DumpPlayers.java
    branches/newsave/src/server/order/DefineShipType.java
    branches/newsave/src/server/order/GetReport.java

Added Paths:
-----------
    branches/newsave/src/game.properties
    branches/newsave/src/server/commands/BanRace.java

Property Changed:
----------------
    branches/newsave/src/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.