2025-11-10 19:21 CET

spring: develop 549e7aac Diff ] Back to Repository ]
Author Committer Branch Timestamp Parent
hoijui hoijui develop 2009-02-19 10:18:49 develop e2dd1f23
Changeset Merge commit 'origin/master' into caiinterface

Conflicts:

    CMakeLists.txt
    rts/lib/streflop/SMath.h
mod - AI/Skirmish/KAI/MicroPather.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/MicroPather.cpp Diff ] File ]
mod - AI/Skirmish/KAIK/PathFinder.cpp Diff ] File ]
mod - CMakeLists.txt Diff ] File ]
mod - installer/spring.nsi Diff ] File ]
mod - rts/Game/GameServer.cpp Diff ] File ]
mod - rts/Game/GameServer.h Diff ] File ]
mod - rts/Game/PreGame.cpp Diff ] File ]
mod - rts/Sim/Path/PathEstimator.h Diff ] File ]
mod - rts/Sim/Path/PathManager.h Diff ] File ]
mod - rts/System/ConfigHandler.cpp Diff ] File ]
mod - rts/System/DemoRecorder.cpp Diff ] File ]
mod - rts/System/DemoRecorder.h Diff ] File ]
mod - rts/System/FileSystem/DataDirLocater.cpp Diff ] File ]
mod - rts/System/NetProtocol.cpp Diff ] File ]
mod - rts/System/Platform/byteorder.h Diff ] File ]
mod - rts/System/Platform/errorhandler.cpp Diff ] File ]
mod - rts/System/Sound/SoundBuffer.cpp Diff ] File ]
mod - rts/System/Sync/SyncChecker.h Diff ] File ]
mod - tools/DedicatedServer/CMakeLists.txt Diff ] File ]