edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 17:44:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
ddnet/src
History
GreYFoXGTi ddb4c2e370 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/DDRace.h
	src/engine/shared/config_variables.h

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-08 22:22:08 +02:00
..
base Merge branch 'master' of http://github.com/oy/teeworlds into master 2010-09-07 07:57:38 +02:00
engine Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 2010-09-08 22:22:08 +02:00
game Merge branch 'master' of github.com:GreYFoXGTi/DDRace into teams2 2010-09-08 22:22:08 +02:00
mastersrv copied refactor to trunk 2010-05-29 07:25:38 +00:00
osxlaunch copied refactor to trunk 2010-05-29 07:25:38 +00:00
tools added fix for crash when there is no datadir 2010-08-05 20:34:16 +02:00
versionsrv fixed line endings in some files 2010-08-15 15:34:55 +02:00