]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/bot-assault
authormand1nga <mand1nga@xonotic.org>
Tue, 16 Aug 2011 04:15:04 +0000 (01:15 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 16 Aug 2011 04:15:04 +0000 (01:15 -0300)
commit5d2f4a6d42d25232423fa1add7461a8f477abe0f
tree239eed7e61a218c93df64938f8da6a1c4a76daa2
parentbf41af38d628dcb817fd9db48efd3c2200fca68d
parentefbe6dfb7724a7a816ddae92868b611c67727160
Merge branch 'master' into mand1nga/bot-assault
qcsrc/server/bot/havocbot/havocbot.qc