Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop e2408227			[ Diff ] [ Back to Repository ]
Peter Sarkozy	Peter Sarkozy	develop	2011-10-14 12:17:50	develop 223981e0
Changeset	Merge branch 'develop' of git://github.com/spring/spring Conflicts: rts/System/Config/ConfigHandler.cpp
	mod - AI/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/C/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/C/data/InterfaceInfo.lua			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/data/InterfaceInfo.lua			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/main/native/JavaBridge.c			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/main/native/JvmLocater_common.c			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/main/native/JvmLocater_solaris.c			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/main/native/JvmLocater_windows.c			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/AAI.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/AAIBuildTable.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/AAIConfig.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/AAIConstructor.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/AAIExecute.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/AAIMap.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/AAI/aidef.h			[ Diff ] [ File ]
	mod - AI/Skirmish/E323AI			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/GResourceMap.cpp			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/GResourceMap.h			[ Diff ] [ File ]
	mod - AI/Skirmish/RAI/RAI.cpp			[ Diff ] [ File ]
	mod - AI/Wrappers/CUtils/SSkirmishAISpecifier.cpp			[ Diff ] [ File ]
	mod - AI/Wrappers/CUtils/SimpleLog.c			[ Diff ] [ File ]
	mod - AI/Wrappers/CUtils/SimpleProfiler.cpp			[ Diff ] [ File ]
	mod - AI/Wrappers/CUtils/Util.c			[ Diff ] [ File ]
	mod - AI/Wrappers/LegacyCpp/AIAICallback.cpp			[ Diff ] [ File ]
	mod - CMakeLists.txt			[ Diff ] [ File ]
	add - VERSION.template			[ Diff ] [ File ]
	mod - buildbot/master/buildbot.mk			[ Diff ] [ File ]
	mod - buildbot/master/master.cfg			[ Diff ] [ File ]
	mod - buildbot/slave/make_installer.sh			[ Diff ] [ File ]
	mod - buildbot/slave/tests-prepare.sh			[ Diff ] [ File ]
	mod - buildbot/slave/tests-run.sh			[ Diff ] [ File ]
	rm - buildbot/slave/update-version.sh			[ Diff ] [ File ]
	mod - cont/base/make_gamedata_arch.bat			[ Diff ] [ File ]
	mod - cont/base/springcontent/shaders/GLSL/SMFFragProg.glsl			[ Diff ] [ File ]
	mod - cont/base/springcontent/shaders/GLSL/SMFVertProg.glsl			[ Diff ] [ File ]
	add - cont/examples/Widgets/watchdog.lua			[ Diff ] [ File ]
	mod - cont/springrc-template-headless.txt			[ Diff ] [ File ]
	mod - cont/uikeys.txt			[ Diff ] [ File ]
	mod - doc/changelog.txt			[ Diff ] [ File ]
	add - doc/engineBranchingModel.dia			[ Diff ] [ File ]
	mod - doc/releasechecklist.txt			[ Diff ] [ File ]
	mod - installer/make_source_package.sh			[ Diff ] [ File ]
	mod - rts/CMakeLists.txt			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICallback.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/Interface/SAIInterfaceCallback.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/Interface/SSkirmishAICallback.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/SAIInterfaceCallbackImpl.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/SAIInterfaceCallbackImpl.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/SSkirmishAICallbackImpl.h			[ Diff ] [ File ]
	mod - rts/Game/GameServer.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameVersion.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameVersion.h			[ Diff ] [ File ]
	mod - rts/Game/LoadScreen.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectedUnits.cpp			[ Diff ] [ File ]
	mod - rts/Game/UnsyncedGameCommands.cpp			[ Diff ] [ File ]
	mod - rts/Game/WaitCommandsAI.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaZip.cpp			[ Diff ] [ File ]
	mod - rts/Map/BaseGroundDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Map/BaseGroundDrawer.h			[ Diff ] [ File ]
	mod - rts/Map/ReadMap.cpp			[ Diff ] [ File ]
mod - rts/Map/ReadMap.h			[ Diff ] [ File ]
mod - rts/Map/SMF/SMFGroundDrawer.cpp			[ Diff ] [ File ]
mod - rts/Map/SMF/SMFReadMap.cpp			[ Diff ] [ File ]
mod - rts/Map/SMF/SMFReadMap.h			[ Diff ] [ File ]
mod - rts/Menu/LobbyConnection.cpp			[ Diff ] [ File ]
mod - rts/Rendering/DefaultPathDrawer.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/DynWater.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Env/SkyLight.cpp			[ Diff ] [ File ]
mod - rts/Rendering/GlobalRendering.cpp			[ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/GroundDecalHandler.h			[ Diff ] [ File ]
mod - rts/Rendering/Shaders/Shader.cpp			[ Diff ] [ File ]
mod - rts/Rendering/Shaders/Shader.h			[ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.cpp			[ Diff ] [ File ]
mod - rts/Rendering/ShadowHandler.h			[ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.cpp			[ Diff ] [ File ]
mod - rts/Rendering/UnitDrawer.h			[ Diff ] [ File ]
mod - rts/Rendering/WorldDrawer.cpp			[ Diff ] [ File ]
mod - rts/Sim/Features/Feature.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/GlobalSynced.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/InterceptHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.cpp			[ Diff ] [ File ]
mod - rts/Sim/Misc/ModInfo.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/AAirMoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/GroundMoveType.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/HoverAirMoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveInfo.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.cpp			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveMath/MoveMath.h			[ Diff ] [ File ]
mod - rts/Sim/MoveTypes/MoveType.cpp			[ Diff ] [ File ]
mod - rts/Sim/Objects/SolidObject.cpp			[ Diff ] [ File ]
mod - rts/Sim/Objects/SolidObject.h			[ Diff ] [ File ]
mod - rts/Sim/Objects/WorldObject.h			[ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathConstants.h			[ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathEstimator.cpp			[ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathFinder.cpp			[ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathFinderDef.cpp			[ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathFinderDef.h			[ Diff ] [ File ]
mod - rts/Sim/Path/Default/PathManager.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/FlareProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/ProjectileHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/Unsynced/RepulseGfx.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/LightningProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/TorpedoProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/AirCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/BuilderCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/CommandAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/CommandAI.h			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/MobileCAI.h			[ Diff ] [ File ]
mod - rts/Sim/Units/Scripts/CobThread.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/Scripts/UnitScript.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/Unit.h			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.h			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Factory.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp			[ Diff ] [ File ]
mod - rts/Sim/Weapons/PlasmaRepulser.cpp			[ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.cpp			[ Diff ] [ File ]
mod - rts/System/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/System/Config/ConfigHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Config/ConfigVariable.cpp			[ Diff ] [ File ]
mod - rts/System/EventClient.cpp			[ Diff ] [ File ]
mod - rts/System/EventClient.h			[ Diff ] [ File ]
mod - rts/System/EventHandler.cpp			[ Diff ] [ File ]
mod - rts/System/EventHandler.h			[ Diff ] [ File ]
mod - rts/System/FileSystem/DataDirLocater.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/ZipArchive.h			[ Diff ] [ File ]
mod - rts/System/Input/Joystick.cpp			[ Diff ] [ File ]
mod - rts/System/LoadSave/DemoReader.cpp			[ Diff ] [ File ]
mod - rts/System/LoadSave/DemoRecorder.cpp			[ Diff ] [ File ]
mod - rts/System/LoadSave/LuaLoadSaveHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Log/DefaultFilter.cpp			[ Diff ] [ File ]
mod - rts/System/Log/DefaultFormatter.cpp			[ Diff ] [ File ]
add - rts/System/Log/DefaultFormatter.h			[ Diff ] [ File ]
add - rts/System/Log/FileSink.cpp			[ Diff ] [ File ]
add - rts/System/Log/FileSink.h			[ Diff ] [ File ]
rm - rts/System/Log/LogOutputSink.cpp			[ Diff ] [ File ]
add - rts/System/Log/OutputDebugStringSink.cpp			[ Diff ] [ File ]
mod - rts/System/Log/Section.h			[ Diff ] [ File ]
mod - rts/System/LogOutput.cpp			[ Diff ] [ File ]
mod - rts/System/LogOutput.h			[ Diff ] [ File ]
mod - rts/System/Object.cpp			[ Diff ] [ File ]
mod - rts/System/Object.h			[ Diff ] [ File ]
mod - rts/System/Platform/Linux/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Misc.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Watchdog.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/errorhandler.h			[ Diff ] [ File ]
mod - rts/System/Rectangle.h			[ Diff ] [ File ]
add - rts/System/SafeCStrings.c			[ Diff ] [ File ]
add - rts/System/SafeCStrings.h			[ Diff ] [ File ]
mod - rts/System/SpringApp.cpp			[ Diff ] [ File ]
mod - rts/System/Sync/Logger.cpp			[ Diff ] [ File ]
add - rts/System/VersionGenerated.h.template			[ Diff ] [ File ]
mod - rts/System/maindefines.h			[ Diff ] [ File ]
mod - rts/System/myMath.cpp			[ Diff ] [ File ]
mod - rts/build/cmake/ConfigureFile.cmake			[ Diff ] [ File ]
add - rts/build/cmake/ConfigureVersion.cmake			[ Diff ] [ File ]
add - rts/build/cmake/FindMiniZip.cmake			[ Diff ] [ File ]
mod - rts/build/cmake/Util.cmake			[ Diff ] [ File ]
add - rts/build/cmake/UtilGit.cmake			[ Diff ] [ File ]
add - rts/build/cmake/UtilVersion.cmake			[ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj			[ Diff ] [ File ]
mod - rts/builds/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/lib/gml/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/lib/lobby/Test/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/lib/minizip/CMakeLists.txt			[ Diff ] [ File ]
mod - test/CMakeLists.txt			[ Diff ] [ File ]
mod - test/engine/System/Log/TestILog.cpp			[ Diff ] [ File ]
mod - test/engine/System/Misc/TestBitwiseEnum.cpp			[ Diff ] [ File ]
rm - test/game/run.sh			[ Diff ] [ File ]
add - test/tools/CompileFailTest/CMakeLists.txt			[ Diff ] [ File ]
add - test/tools/CompileFailTest/CompileFailTest.cmake			[ Diff ] [ File ]
add - test/validation/run.sh			[ Diff ] [ File ]
mod - tools/ArchiveMover/ArchiveMover.cpp			[ Diff ] [ File ]
mod - tools/ArchiveMover/CMakeLists.txt			[ Diff ] [ File ]
mod - tools/DemoTool/CMakeLists.txt			[ Diff ] [ File ]
mod - tools/unitsync/CMakeLists.txt			[ Diff ] [ File ]
mod - tools/unitsync/unitsync.cpp			[ Diff ] [ File ]
mod - tools/unitsync/unitsync_api.h			[ Diff ] [ File ]