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)
1  2 
defaultXonotic.cfg
qcsrc/server/bot/bot.qc
qcsrc/server/cl_player.qc

Simple merge
Simple merge
Simple merge