ddnet/src/engine/shared
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
..
compression.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
compression.h Updated copyrights 2010-11-20 21:26:06 +01:00
config.cpp made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
config.h made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
config_variables.h made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
console.cpp made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
console.h made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
datafile.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
datafile.h Updated copyrights 2010-11-20 21:26:06 +01:00
demo.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
demo.h Updated copyrights 2010-11-20 21:26:06 +01:00
engine.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
engine.h Updated copyrights 2010-11-20 21:26:06 +01:00
huffman.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
huffman.h Updated copyrights 2010-11-20 21:26:06 +01:00
jobs.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
jobs.h Updated copyrights 2010-11-20 21:26:06 +01:00
kernel.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
linereader.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
linereader.h Updated copyrights 2010-11-20 21:26:06 +01:00
map.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
masterserver.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
memheap.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
memheap.h Updated copyrights 2010-11-20 21:26:06 +01:00
message.h Updated copyrights 2010-11-20 21:26:06 +01:00
network.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
network.h Updated copyrights 2010-11-20 21:26:06 +01:00
network_client.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
network_conn.cpp made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 2010-11-22 00:26:00 +02:00
network_server.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
packer.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
packer.h Updated copyrights 2010-11-20 21:26:06 +01:00
protocol.h Updated copyrights 2010-11-20 21:26:06 +01:00
ringbuffer.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
ringbuffer.h Updated copyrights 2010-11-20 21:26:06 +01:00
snapshot.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
snapshot.h Updated copyrights 2010-11-20 21:26:06 +01:00
storage.cpp Updated copyrights 2010-11-20 21:26:06 +01:00
storage.h Fix external records 2010-07-31 15:04:19 +04:00