]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/bot-fixes-II
authormand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 01:45:28 +0000 (22:45 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 01:45:28 +0000 (22:45 -0300)
commitb28e94c9e28dca6e3ee80d2e4f0aeb71b8074786
tree8f86e432a180ee4444de1205151b185d98dfcfcb
parent03ad25908f104e840b2800a57aa4317ed173ebaa
parent3873035305ee4dd551beabf68bcb23d1a2611b5e
Merge branch 'master' into mand1nga/bot-fixes-II