Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop 6d752622			[ Diff ] [ Back to Repository ]
hoijui	hoijui	develop	2010-09-17 22:56:08	develop ce2d920a
Changeset	Merge remote branch 'origin/master' into pureint Conflicts: AI/Skirmish/E323AI
	mod - CMakeLists.txt			[ Diff ] [ File ]
	mod - cont/CMakeLists.txt			[ Diff ] [ File ]
	mod - installer/make_installer.pl			[ Diff ] [ File ]
	mod - installer/make_source_package.sh			[ Diff ] [ File ]
	mod - installer/sections/main.nsh			[ Diff ] [ File ]
	mod - installer/sections/sectiondesc.nsh			[ Diff ] [ File ]
	rm - installer/sections/selectionEditor.nsh			[ Diff ] [ File ]
	mod - installer/sections/shortcuts_startMenu.nsh			[ Diff ] [ File ]
	mod - installer/spring.nsi			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICallback.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICallback.h			[ Diff ] [ File ]
	mod - rts/Game/GameHelper.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameHelper.h			[ Diff ] [ File ]
	mod - rts/Game/LoadScreen.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/EndGameBox.cpp			[ Diff ] [ File ]
	mod - rts/Game/UnsyncedGameCommands.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaPathFinder.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaPathFinder.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedRead.cpp			[ Diff ] [ File ]
	mod - rts/Map/BaseGroundDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Map/BaseGroundDrawer.h			[ Diff ] [ File ]
	mod - rts/Rendering/DefaultPathDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/GL/VertexArray.cpp			[ Diff ] [ File ]
	mod - rts/Rendering/GL/VertexArray.h			[ Diff ] [ File ]
	mod - rts/Rendering/GL/VertexArray.inl			[ Diff ] [ File ]
	mod - rts/Rendering/UnitDrawer.cpp			[ Diff ] [ File ]
	mod - rts/Sim/MoveTypes/GroundMoveType.cpp			[ Diff ] [ File ]
	add - rts/Sim/Path/Default/PathAllocator.cpp			[ Diff ] [ File ]
	add - rts/Sim/Path/Default/PathAllocator.h			[ Diff ] [ File ]
	add - rts/Sim/Path/Default/PathConstants.h			[ Diff ] [ File ]
	add - rts/Sim/Path/Default/PathDataTypes.h			[ Diff ] [ File ]
	mod - rts/Sim/Path/Default/PathEstimator.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Path/Default/PathEstimator.h			[ Diff ] [ File ]
	mod - rts/Sim/Path/Default/PathFinder.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Path/Default/PathFinder.h			[ Diff ] [ File ]
	add - 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/Path/Default/PathManager.h			[ Diff ] [ File ]
	mod - rts/Sim/Path/IPathManager.h			[ Diff ] [ File ]
	add - rts/Sim/Units/BuildInfo.cpp			[ Diff ] [ File ]
	add - rts/Sim/Units/BuildInfo.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/COB/UnitScript.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/AirCAI.h			[ 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.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/FactoryCAI.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/MobileCAI.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/TransportCAI.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/TransportCAI.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitDef.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitDef.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitHandler.cpp			[ 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/Building.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitTypes/ExtractorBuilding.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitTypes/Factory.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitTypes/Factory.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/UnitTypes/TransportUnit.h			[ Diff ] [ File ]
	mod - rts/System/Main.cpp			[ Diff ] [ File ]
	mod - rts/System/Platform/Threading.cpp			[ Diff ] [ File ]
mod - rts/System/Platform/Win/CrashHandler.cpp			[ Diff ] [ File ]
mod - rts/build/vstudio8/rts.vcproj			[ Diff ] [ File ]
mod - rts/builds/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/builds/DS/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/builds/GML/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/builds/HL/CMakeLists.txt			[ Diff ] [ File ]
mod - rts/builds/default/CMakeLists.txt			[ Diff ] [ File ]
rm - tools/SelectionEditor/DataStore.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/DataStore.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/FilterDlg.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/FilterDlg.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/HotKeyDlg.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/HotKeyDlg.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/ReadMe.txt			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.aps			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.rc			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.sln			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.suo			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditor.vcproj			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditorDlg.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/SelectionEditorDlg.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/SourceDlg.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/SourceDlg.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/res/SelectionEditor.ico			[ Diff ] [ File ]
rm - tools/SelectionEditor/res/SelectionEditor.manifest			[ Diff ] [ File ]
rm - tools/SelectionEditor/res/SelectionEditor.rc2			[ Diff ] [ File ]
rm - tools/SelectionEditor/resource.h			[ Diff ] [ File ]
rm - tools/SelectionEditor/stdafx.cpp			[ Diff ] [ File ]
rm - tools/SelectionEditor/stdafx.h			[ Diff ] [ File ]
add - tools/scripts/log-colorizer.py			[ Diff ] [ File ]
mod - tools/unitsync/unitsync.cpp			[ Diff ] [ File ]
mod - tools/unitsync/unitsync_api.h			[ Diff ] [ File ]