lilium-voyager/code/server
Zack Middleton e1f0a69716 Merge branch 'master' into game/eliteforce
Conflicts:
	Makefile
	code/qcommon/msg.c
	make-macosx-app.sh
2018-05-18 04:40:21 -05:00
..
server.h Merge branch 'master' into game/eliteforce 2018-03-03 19:27:28 -06: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 2018-05-18 04:40:21 -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 2018-03-03 19:27:28 -06:00
sv_main.c Fix server not being added to Raven master list 2018-03-04 00:39:38 -06: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 2018-03-03 19:27:28 -06:00
sv_world.c Fix indent warning in sv_world.c 2018-03-06 18:38:45 -06:00