This commit was manufactured by cvs2svn to create branch 'bzflag'.

git-svn-id: https://svn.code.sf.net/p/bzflag/code/branches/bzflag@4 08b3d480-bf2c-0410-a26f-811ee3361c24
This commit was manufactured by cvs2svn to create branch 'bzflag'.

git-svn-id: https://svn.code.sf.net/p/bzflag/code/branches/bzflag@23 08b3d480-bf2c-0410-a26f-811ee3361c24
This commit was manufactured by cvs2svn to create branch 'bzflag'.

git-svn-id: https://svn.code.sf.net/p/bzflag/code/branches/bzflag@297 08b3d480-bf2c-0410-a26f-811ee3361c24
new project started


git-svn-id: https://svn.code.sf.net/p/bzflag/code/branches/bzflag@298 08b3d480-bf2c-0410-a26f-811ee3361c24
remove bogus "bzflag" branch

git-svn-id: https://svn.code.sf.net/p/bzflag/code/branches/bzflag@21389 08b3d480-bf2c-0410-a26f-811ee3361c24
Merge branch 'bzflag' of https://github.com/jwmelto/bzflag-import-3 into v2_4_x

Conflicts:
	Makefile.am
	PORTING
	README
	README.SOLARIS
	include/Address.h
	include/BSPSceneDatabase.h
	include/BaseResources.h
	include/BillboardSceneNode.h
	include/BoltSceneNode.h
	include/BoxBuilding.h
	include/BzfDisplay.h
	include/BzfEvent.h
	include/BzfMedia.h
	include/BzfVisual.h
	include/BzfWindow.h
	include/EighthDBoxSceneNode.h
	include/EighthDPyrSceneNode.h
	include/EighthDimSceneNode.h
	include/ErrorHandler.h
	include/Flag.h
	include/FlagSceneNode.h
	include/FlagWarpSceneNode.h
	include/Intersect.h
	include/LaserSceneNode.h
	include/Obstacle.h
	include/OpenGLGState.h
	include/OpenGLLight.h
	include/OpenGLMaterial.h
	include/OpenGLTexture.h
	include/PTSceneNode.h
	include/Pack.h
	include/Ping.h
	include/PlatformFactory.h
	include/PolyWallSceneNode.h
	include/Protocol.h
	include/PyramidBuilding.h
	include/QuadWallSceneNode.h
	include/Ray.h
	include/RenderNode.h
	include/SceneDatabase.h
	include/SceneNode.h
	include/SceneRenderer.h
	include/ShellSceneNode.h
	include/ShotSceneNode.h
	include/SphereSceneNode.h
	include/TankSceneNode.h
	include/Team.h
	include/Teleporter.h
	include/TimeBomb.h
	include/TimeKeeper.h
	include/TracerSceneNode.h
	include/TriWallSceneNode.h
	include/ViewFrustum.h
	include/WallObstacle.h
	include/WallSceneNode.h
	include/ZSceneDatabase.h
	include/bzfgl.h
	include/bzfio.h
	include/common.h
	include/global.h
	include/multicast.h
	include/network.h
	include/resource.h
	misc/bzfquery.pl
	package/irix/bzflag.fti
	package/irix/bzflag.ftr
	package/irix/bzfs.fti
	package/irix/idb
	package/irix/spec-irix-mips2
	package/irix/spec-irix-mips3
	package/win32/README.win32.html
	src/bzflag/BackgroundRenderer.cxx
	src/bzflag/BackgroundRenderer.h
	src/bzflag/ControlPanel.cxx
	src/bzflag/ControlPanel.h
	src/bzflag/HUDDialog.cxx
	src/bzflag/HUDDialog.h
	src/bzflag/HUDRenderer.cxx
	src/bzflag/HUDRenderer.h
	src/bzflag/HUDui.cxx
	src/bzflag/HUDui.h
	src/bzflag/LocalPlayer.cxx
	src/bzflag/LocalPlayer.h
	src/bzflag/MainWindow.cxx
	src/bzflag/MainWindow.h
	src/bzflag/Player.cxx
	src/bzflag/Player.h
	src/bzflag/RadarRenderer.cxx
	src/bzflag/RadarRenderer.h
	src/bzflag/Region.cxx
	src/bzflag/Region.h
	src/bzflag/RemotePlayer.cxx
	src/bzflag/RemotePlayer.h
	src/bzflag/RobotPlayer.cxx
	src/bzflag/RobotPlayer.h
	src/bzflag/SceneBuilder.cxx
	src/bzflag/SceneBuilder.h
	src/bzflag/SceneRenderer.cxx
	src/bzflag/ServerLink.cxx
	src/bzflag/ServerLink.h
	src/bzflag/ShotPath.cxx
	src/bzflag/ShotPath.h
	src/bzflag/ShotStrategy.cxx
	src/bzflag/ShotStrategy.h
	src/bzflag/World.cxx
	src/bzflag/World.h
	src/bzflag/bzflag.cxx
	src/bzflag/daylight.cxx
	src/bzflag/daylight.h
	src/bzflag/playing.cxx
	src/bzflag/playing.h
	src/bzflag/sound.cxx
	src/bzflag/sound.h
	src/bzflag/stars.cxx
	src/bzfs/bzfs.cxx
	src/common/ErrorHandler.cxx
	src/common/Flag.cxx
	src/common/Team.cxx
	src/common/TimeBomb.cxx
	src/common/TimeKeeper.cxx
	src/game/Ray.cxx
	src/geometry/BillboardSceneNode.cxx
	src/geometry/BoltSceneNode.cxx
	src/geometry/EighthDBoxSceneNode.cxx
	src/geometry/EighthDPyrSceneNode.cxx
	src/geometry/EighthDimSceneNode.cxx
	src/geometry/FlagSceneNode.cxx
	src/geometry/FlagWarpSceneNode.cxx
	src/geometry/LaserSceneNode.cxx
	src/geometry/PTSceneNode.cxx
	src/geometry/PolyWallSceneNode.cxx
	src/geometry/QuadWallSceneNode.cxx
	src/geometry/SceneNode.cxx
	src/geometry/ShellSceneNode.cxx
	src/geometry/SphereSceneNode.cxx
	src/geometry/TankSceneNode.cxx
	src/geometry/TracerSceneNode.cxx
	src/geometry/TriWallSceneNode.cxx
	src/geometry/ViewFrustum.cxx
	src/geometry/WallSceneNode.cxx
	src/net/Address.cxx
	src/net/Pack.cxx
	src/net/multicast.cxx
	src/net/network.cxx
	src/obstacle/BoxBuilding.cxx
	src/obstacle/Obstacle.cxx
	src/obstacle/PyramidBuilding.cxx
	src/obstacle/Teleporter.cxx
	src/obstacle/WallObstacle.cxx
	src/ogl/OpenGLGState.cxx
	src/ogl/OpenGLLight.cxx
	src/ogl/OpenGLMaterial.cxx
	src/ogl/OpenGLTexture.cxx
	src/other/curl/vc6curl.dsw
	src/platform/BzfDisplay.cxx
	src/platform/BzfMedia.cxx
	src/platform/BzfVisual.cxx
	src/platform/BzfWindow.cxx
	src/platform/LinuxMedia.cxx
	src/platform/LinuxMedia.h
	src/platform/LinuxPlatformFactory.cxx
	src/platform/LinuxPlatformFactory.h
	src/platform/NewMedia.cxx
	src/platform/NewMedia.h
	src/platform/PlatformFactory.cxx
	src/platform/SGIMedia.cxx
	src/platform/SGIMedia.h
	src/platform/SGIPlatformFactory.cxx
	src/platform/SGIPlatformFactory.h
	src/platform/SolarisMedia.cxx
	src/platform/SolarisMedia.h
	src/platform/SolarisPlatformFactory.cxx
	src/platform/SolarisPlatformFactory.h
	src/platform/WinDisplay.cxx
	src/platform/WinDisplay.h
	src/platform/WinMedia.cxx
	src/platform/WinMedia.h
	src/platform/WinPlatformFactory.cxx
	src/platform/WinPlatformFactory.h
	src/platform/WinVisual.cxx
	src/platform/WinVisual.h
	src/platform/WinWindow.cxx
	src/platform/WinWindow.h
	src/platform/XDisplay.cxx
	src/platform/XDisplay.h
	src/platform/XVisual.cxx
	src/platform/XVisual.h
	src/platform/XWindow.cxx
	src/platform/XWindow.h
	src/platform/wave.cxx
	src/platform/wave.h
	src/scene/BSPSceneDatabase.cxx
	src/scene/SceneDatabase.cxx
	src/scene/ZSceneDatabase.cxx
Merge remote-tracking branch 'upstream/v2_4_x' into v2_4_x
Added XCode cruft