lilium-voyager/code/server
Zack Middleton 4837f4619e Merge branch 'master' into game/eliteforce
Conflicts:
	code/client/cl_main.c
	code/qcommon/common.c
	code/qcommon/files.c
	code/qcommon/msg.c
	code/qcommon/q_shared.h
	code/renderercommon/tr_common.h
	code/renderergl2/tr_extensions.c
	code/sdl/sdl_glimp.c
2017-09-17 23:16:55 -05:00
..
server.h Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sv_bot.c Remove FS_Read2(). 2017-03-17 04:21:11 -07:00
sv_ccmds.c Echo server say/tell/sayto message to console 2017-07-24 20:55:14 -05:00
sv_client.c Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sv_game.c Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sv_init.c Merge branch 'master' into game/eliteforce 2016-06-17 02:22:52 -05:00
sv_main.c Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sv_net_chan.c Elite Force white space clean up 2014-10-29 10:13:12 -05:00
sv_rankings.c add a missing '\n', remove some unwanted ones 2012-06-18 16:16:57 +00:00
sv_snapshot.c Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sv_world.c Port Elite Force iorev2231 patch to latest ioq3 2014-10-29 07:15:12 -05:00