| spring: develop 496f22eb | [ Diff ] [ Back to Repository ] | |||
| Author | Committer | Branch | Timestamp | Parent |
|---|---|---|---|---|
| abma | abma | develop | 2012-03-20 01:11:39 | develop 1e438331 |
| Changeset | Merge remote-tracking branch 'origin/release' into develop Conflicts: rts/Sim/Path/Default/PathFinder.cpp |
|||
| mod - CMakeLists.txt | [ Diff ] [ File ] | |||
| mod - buildbot/slave/tests-prepare.sh | [ Diff ] [ File ] | |||
| mod - cont/LuaUI/system.lua | [ Diff ] [ File ] | |||
| mod - cont/base/springcontent/LuaGadgets/system.lua | [ Diff ] [ File ] | |||
| mod - doc/changelog.txt | [ Diff ] [ File ] | |||
| mod - installer/make_installer.sh | [ Diff ] [ File ] | |||
| add - installer/sections/vcredist.nsh | [ Diff ] [ File ] | |||
| mod - installer/spring.nsi | [ Diff ] [ File ] | |||
| mod - rts/Lua/LuaUtils.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/CommandAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/CommandAI/FactoryCAI.h | [ Diff ] [ File ] | |||
| mod - rts/Sim/Units/UnitTypes/Factory.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/FileSystem/ArchiveScanner.cpp | [ Diff ] [ File ] | |||
| mod - rts/System/Log/Section.h | [ Diff ] [ File ] | |||
| mod - test/engine/System/Log/TestILog.cpp | [ Diff ] [ File ] | |||
