]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'mand1nga/bot-fix-aiming-origins' into mand1nga/bot-assault
authormand1nga <mand1nga@xonotic.org>
Tue, 9 Aug 2011 02:23:54 +0000 (23:23 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 9 Aug 2011 02:23:54 +0000 (23:23 -0300)
commit115e9ad8d9c72dedd907d15e8d4e33e27ea1306a
tree54585ab072bfb6127a2d442b8115796f4f2d2ede
parent7c45ce8743d3e5b6cbcddce737d5c944dd93ad95
parent8b2a456d83da008b5d17ec6092716a20718c0798
Merge branch 'mand1nga/bot-fix-aiming-origins' into mand1nga/bot-assault
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc