Source Control Integration

Author	Committer	Branch	Timestamp	Parent
spring: develop eaf64cb9			[ Diff ] [ Back to Repository ]
hoijui	hoijui	develop	2009-09-19 14:09:43	develop bff59348
Changeset	Merge commit 'origin/master' into javaaispeed Conflicts: AI/Interfaces/Java/data/jvm.properties AI/Interfaces/Java/src/native/JavaBridge.c
	mod - AI/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/C/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/bin/jna_wrappEvents.awk			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/data/jvm.properties			[ Diff ] [ File ]
	mod - AI/Interfaces/Java/src/native/JavaBridge.c			[ Diff ] [ File ]
	mod - AI/Skirmish/CMakeLists.txt			[ Diff ] [ File ]
	mod - AI/Skirmish/E323AI			[ Diff ] [ File ]
	mod - AI/Skirmish/HughAI			[ Diff ] [ File ]
	mod - AI/Wrappers/LegacyCpp/CMakeLists.txt			[ Diff ] [ File ]
	mod - CMakeLists.txt			[ Diff ] [ File ]
	add - Documentation/SelectionKeys.txt			[ Diff ] [ File ]
	mod - Documentation/cmds.txt			[ Diff ] [ File ]
	mod - installer/builddata/springcontent/LuaGadgets/Gadgets/unit_script.lua			[ Diff ] [ File ]
	mod - installer/sections/docs.nsh			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICallback.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICallback.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/AICheats.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/EngineOutHandler.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/Interface/SSkirmishAICallback.h			[ Diff ] [ File ]
	mod - rts/ExternalAI/SkirmishAI.cpp			[ Diff ] [ File ]
	mod - rts/ExternalAI/SkirmishAI.h			[ Diff ] [ File ]
	mod - rts/Game/Camera/CameraController.cpp			[ Diff ] [ File ]
	mod - rts/Game/Camera/CameraController.h			[ Diff ] [ File ]
	mod - rts/Game/Game.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameHelper.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameHelper.h			[ Diff ] [ File ]
	mod - rts/Game/GameServer.cpp			[ Diff ] [ File ]
	mod - rts/Game/GameServer.h			[ Diff ] [ File ]
	mod - rts/Game/PlayerHandler.h			[ Diff ] [ File ]
	mod - rts/Game/SelectedUnits.cpp			[ Diff ] [ File ]
	mod - rts/Game/SelectedUnits.h			[ Diff ] [ File ]
	mod - rts/Game/StartScripts/SkirmishAITestScript.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/GuiHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/KeyBindings.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/MouseCursor.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/MouseHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/SelectionKeyHandler.cpp			[ Diff ] [ File ]
	mod - rts/Game/UI/SelectionKeyHandler.h			[ Diff ] [ File ]
	mod - rts/Game/WordCompletion.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaHandle.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaParser.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaParser.h			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedCtrl.cpp			[ Diff ] [ File ]
	mod - rts/Lua/LuaUnsyncedRead.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Features/FeatureHandler.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Features/FeatureHandler.h			[ Diff ] [ File ]
	mod - rts/Sim/Misc/CommonDefHandler.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/COB/CobInstance.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/COB/LuaScriptNames.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/COB/LuaScriptNames.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/COB/LuaUnitScript.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/AirCAI.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.cpp			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/CommandAI.h			[ Diff ] [ File ]
	mod - rts/Sim/Units/CommandAI/FactoryCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/FactoryCAI.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/CommandAI/TransportCAI.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/CommandAI/TransportCAI.h			[ Diff ] [ File ]
mod - rts/Sim/Units/Groups/Group.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/Groups/Group.h			[ Diff ] [ File ]
mod - rts/Sim/Units/Groups/GroupHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitDefHandler.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitHandler.h			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/Builder.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.cpp			[ Diff ] [ File ]
mod - rts/Sim/Units/UnitTypes/TransportUnit.h			[ Diff ] [ File ]
mod - rts/Sim/Weapons/BeamLaser.cpp			[ Diff ] [ File ]
mod - rts/Sim/Weapons/LightningCannon.cpp			[ Diff ] [ File ]
mod - rts/Sim/Weapons/Rifle.cpp			[ Diff ] [ File ]
mod - rts/Sim/Weapons/WeaponDefHandler.cpp			[ Diff ] [ File ]
mod - rts/System/FastMath.h			[ Diff ] [ File ]
mod - rts/System/FileSystem/FileHandler.cpp			[ Diff ] [ File ]
mod - rts/System/FileSystem/FileHandler.h			[ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.cpp			[ Diff ] [ File ]
mod - rts/System/Net/UDPConnection.h			[ Diff ] [ File ]
mod - rts/System/Net/UDPListener.cpp			[ Diff ] [ File ]
mod - rts/System/NetProtocol.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/AudioChannel.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/AudioChannel.h			[ Diff ] [ File ]
mod - rts/System/Sound/Music.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/Music.h			[ Diff ] [ File ]
mod - rts/System/Sound/OggStream.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/OggStream.h			[ Diff ] [ File ]
mod - rts/System/Sound/Sound.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/Sound.h			[ Diff ] [ File ]
mod - rts/System/Sound/SoundBuffer.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/SoundSource.cpp			[ Diff ] [ File ]
mod - rts/System/Sound/SoundSource.h			[ Diff ] [ File ]
mod - rts/System/TdfParser.cpp			[ Diff ] [ File ]
mod - rts/System/TdfParser.h			[ Diff ] [ File ]
mod - rts/System/maindefines.h			[ Diff ] [ File ]
mod - rts/System/myTime.h			[ Diff ] [ File ]
mod - rts/System/tdf_grammar.hpp			[ Diff ] [ File ]
mod - rts/aGui/List.cpp			[ Diff ] [ File ]
mod - tools/DedicatedServer/main.cpp			[ Diff ] [ File ]