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
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
..
base Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00
engine Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00
game Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 2013-12-26 18:02:22 +01:00
mastersrv fixed banning on the master server 2013-02-24 17:35:31 +01:00
osxlaunch some make release changes for adding sql server files 2011-04-15 04:32:53 +02:00
tools cleaned up content folder creation. Closes #845 2012-01-09 01:38:45 +01:00
versionsrv fixed some merge problems 2013-02-24 18:55:55 +01:00