]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/pooga/keepawaybots'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:17:40 +0000 (10:17 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:17:40 +0000 (10:17 +0200)
commit1a507acfe146c88e76d252ddec4242210ac8923f
tree3404291442c1bcd15b35f0e3cfbdc66315c7f94b
parent4f920aea0bcef26f3e026827db1f3172606651bf
parent04367582aa7c38c7c624ef4dff508933248e48a5
Merge remote branch 'origin/pooga/keepawaybots'

Conflicts:
qcsrc/server/bot/aim.qc
qcsrc/server/bot/aim.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/mutators/gamemode_keepaway.qc