Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop e5c30358			[ Diff ] [ Back to Repository ]
abma	abma	develop	2012-07-08 22:06:31	develop 1b517997
Changeset	Merge remote-tracking branch 'origin/release' into develop Conflicts: rts/Sim/Units/UnitDef.cpp
	mod - AI/Interfaces/Java/src/main/native/JavaBridge.c			[ Diff ] [ File ]
	mod - AI/Skirmish/E323AI			[ Diff ] [ File ]
	mod - AI/Skirmish/Shard			[ Diff ] [ File ]
	mod - Doxyfile			[ Diff ] [ File ]
	mod - buildbot/README.markdown			[ Diff ] [ File ]
	mod - buildbot/slave/make_installer.sh			[ Diff ] [ File ]
	mod - cont/base/springcontent/gamedata/sounds.lua			[ Diff ] [ File ]
	mod - doc/changelog.txt			[ Diff ] [ File ]
	mod - doc/releasechecklist.txt			[ Diff ] [ File ]
	mod - installer/make_portable_archive.sh			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICallback.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICheats.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/SSkirmishAICallbackImpl.cpp			[ Diff ] [ File ]
	mod - rts/Game/Game.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameHelper.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameServer.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameSetup.cpp			[ Diff ] [ File ]
	mod - rts/Game/LoadScreen.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectedUnits.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectedUnitsAI.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/GuiHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/KeyBindings.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/MiniMap.cpp			[ Diff ] [ File ]
	mod - rts/Game/WaitCommandsAI.cpp			[ Diff ] [ File ]
	mod - rts/Lua/CMakeLists.txt			[ Diff ] [ File ]
	mod - rts/Lua/LuaEventBatch.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaFBOs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaFeatureDefs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaHandle.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaRBOs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaSyncedRead.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnitDefs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedCtrl.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedRead.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaWeaponDefs.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaZip.cpp			[ Diff ] [ File ]
	mod - rts/Map/SM3/terrain/TerrainTexEnvCombine.cpp			[ Diff ] [ File ]
	mod - rts/Map/SMF/ROAM/Patch.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/CommandDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/DebugColVolDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/BumpWater.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/CubeMapHandler.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/Env/SkyBox.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/GL/Light.h			[ Diff ] [ File ]
	mod - rts/Rendering/GL/myGL.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/GlobalRendering.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/GlobalRendering.h			[ Diff ] [ File ]
	mod - rts/Rendering/ShadowHandler.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Misc/CollisionHandler.h			[ Diff ] [ File ]
	mod - rts/Sim/Misc/ModInfo.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Misc/ModInfo.h			[ Diff ] [ File ]
	mod - rts/Sim/MoveTypes/StrafeAirMoveType.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Path/Default/PathDataTypes.h			[ Diff ] [ File ]
	mod - rts/Sim/Path/QTPFS/PathDefines.hpp			[ Diff ] [ File ]
	mod - rts/Sim/Path/QTPFS/PathManager.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Path/QTPFS/PathManager.hpp			[ Diff ] [ File ]
	mod - rts/Sim/Path/QTPFS/PathSearch.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Projectiles/ExplosionGenerator.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Projectiles/ExplosionGenerator.h			[ 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/BuilderCAI.h			[ 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/TransportCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/Unit.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitDef.cpp			[ Diff ] [ File ]
mod - rts/Sim/Weapons/Weapon.cpp			[ Diff ] [ File ]
mod - rts/System/Config/ConfigHandler.cpp			[ Diff ] [ File ]
mod - rts/System/Config/ConfigHandler.h			[ Diff ] [ File ]
mod - rts/System/EventHandler.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/FileSystemAbstraction.cpp			[ Diff ] [ File ]
mod - rts/System/GlobalConfig.cpp			[ Diff ] [ File ]
mod - rts/System/GlobalConfig.h			[ Diff ] [ File ]
mod - rts/System/Net/Socket.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/CmdLineParams.h			[ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp			[ Diff ] [ File ]
add - rts/System/Platform/Win/vs2010.cpp			[ Diff ] [ File ]
add - rts/System/Platform/Win/vs2010.h			[ Diff ] [ File ]
mod - rts/System/SafeVector.h			[ Diff ] [ File ]
mod - rts/System/float3.h			[ Diff ] [ File ]
mod - rts/System/float4.h			[ Diff ] [ File ]
add - rts/build/vstudio10/resource.h			[ Diff ] [ File ]
add - rts/build/vstudio10/rts.rc			[ Diff ] [ File ]
add - rts/build/vstudio10/rts.sln			[ Diff ] [ File ]
add - rts/build/vstudio10/rts.vcxproj			[ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj			[ Diff ] [ File ]
mod - rts/lib/assimp/code/IFCCurve.cpp			[ Diff ] [ File ]
mod - tools/pr-downloader			[ Diff ] [ File ]
mod - tools/unitsync/unitsync.cpp			[ Diff ] [ File ]