]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/mand1nga/bot-debug'
authormand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:37:40 +0000 (22:37 -0300)
committermand1nga <mand1nga@xonotic.org>
Tue, 19 Apr 2011 01:37:40 +0000 (22:37 -0300)
commit335f6e451cea2570b4f6fe86ba91599a951931bd
treec7258adf8869a8ba2d33a72f43ddd130e64a1ab8
parentf2d298b588b2f4fa3e2590b2ca32677feaf102e4
parentf62aa0ea9e2ecc7f866b39e1bd969031d7ebcb78
Merge remote branch 'origin/mand1nga/bot-debug'