]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:28:50 +0000 (10:28 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:28:50 +0000 (10:28 +0200)
commit8fd199794a4136325f14dfff5b1d0d44da32f3cb
tree95ba56aec65085e67d4ce06bb5c933d916a79511
parent94cf38e5a76dfe79cecd83f75d974de2361788b3
parent1a507acfe146c88e76d252ddec4242210ac8923f
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

Conflicts:
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc