Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 15 Jun 2010 09:08:10 +0000 (11:08 +0200)
commit1f5d48dd87aaf7d479958202f3960de01ac877d2
treee193f0133f52ef986ef69c299e7b7820464dc364
parentc52a7151ee8b3ab36c656dfe196cc61564b1332c
parentffbcc8a1f016da5a7e2441c29c1597f68735fbb9
Merge remote branch 'refs/remotes/origin/terencehill/bot_vs_human_fix'
defaultXonotic.cfg
qcsrc/server/bot/bot.qc
qcsrc/server/cl_player.qc