| spring: develop c9bba64e | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| hoijui | hoijui | develop | 2010-05-19 21:48:52 | develop 5810b3cf |
| Changeset | Merge remote branch 'originSpring/master' into pureint Conflicts: AI/Wrappers/Cpp/CMakeLists.txt AI/Wrappers/JavaOO/CMakeLists.txt AI/Wrappers/LegacyCpp/AIAICallback.cpp rts/ExternalAI/Interface/SSkirmishAICallback.h rts/ExternalAI/SSkirmishAICallbackImpl.cpp rts/ExternalAI/SSkirmishAICallbackImpl.h rts/Sim/Units/UnitDef.h |
|||
| mod - AI/Wrappers/Cpp/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/JavaOO/CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/Interface/SSkirmishAICallback.h | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp | [ Diff ] [ File ] | |||
| mod - rts/ExternalAI/SSkirmishAICallbackImpl.h | [ Diff ] [ File ] | |||
| mod - rts/Game/SelectedUnits.cpp | [ Diff ] [ File ] | |||
| mod - rts/Game/UI/TooltipConsole.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/GL/myGL.cpp | [ Diff ] [ File ] | |||
| mod - rts/Rendering/UnitDrawer.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Features/FeatureHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionHandler.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionVolume.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Misc/CollisionVolume.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDef.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitDefHandler.cpp | [ Diff ] [ File ] | |||
