| spring: develop 44c42bc1 | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-09-11 12:43:51 | develop f8ef6b38 |
| Changeset | Merge remote branch 'origin/master' into pureint Conflicts: AI/Wrappers/LegacyCpp/AIAICallback.cpp rts/ExternalAI/Interface/AISCommands.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/Sim/Units/UnitDef.h |
|||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/LuaGadgets/Gadgets/game_end.lua | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AICheats.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/AILegacySupport.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/AISCommands.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/Game.h | [ Diff ] [ File ] | |||
| mod - rts/Game/GameHelper.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/GameServer.h | [ Diff ] [ File ] | |||
| mod - rts/Game/NetCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/EndGameBox.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/EndGameBox.h | [ Diff ] [ File ] | |||
| mod - rts/Game/UnsyncedGameCommands.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHandle.cpp | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaHandle.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/MoveTypes/GroundMoveType.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/Unit.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitHandler.h | [ Diff ] [ File ] | |||
| mod - rts/System/AutohostInterface.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/AutohostInterface.h | [ Diff ] [ File ] | |||
| mod - rts/System/BaseNetProtocol.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/BaseNetProtocol.h | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/GlobalUnsynced.h | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/DemoReader.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/DemoReader.h | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/DemoRecorder.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/LoadSave/DemoRecorder.h | [ Diff ] [ File ] | |||
