Merge remote branch 'origin/fruitiex/bots'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:07 +0000 (14:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:07 +0000 (14:07 +0100)
commit2a9df1dc726597e8943be9ef956620c36693d219
tree61a26ed8aec72dce0f09570499e5752886b7008f
parent30016be3301606bd261f442ebf74dc796567ffa1
parentac33435fe636aaad7210e1a8f9f723f6134a7823
Merge remote branch 'origin/fruitiex/bots'
defaultXonotic.cfg
qcsrc/server/bot/aim.qc
qcsrc/server/bot/havocbot/havocbot.qc