edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-21 10:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
ddnet/src/engine/server
History
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
2013-12-26 18:02:22 +01:00
..
fifoconsole.cpp no thread remove 2013-08-08 02:10:47 +02:00
fifoconsole.h no thread remove 2013-08-08 02:10:47 +02:00
register.cpp added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
register.h Merge branch 'master' of git://github.com/oy/teeworlds 2011-05-09 18:36:13 +02:00
server.cpp Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00
server.h Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00