Commit graph

2 commits

Author SHA1 Message Date
Zack Middleton
e45538b1c5 Merge branch 'master' into game/eliteforce
Conflicts:
	README.md
	code/server/sv_client.c
2018-03-03 19:27:28 -06:00
Zack Middleton
94a709dd68 Rename ioq3 readme 2017-09-18 01:20:55 -05:00
Renamed from README.md (Browse further)