]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/bot-debug
authormand1nga <mand1nga@xonotic.org>
Wed, 20 Apr 2011 05:28:02 +0000 (02:28 -0300)
committermand1nga <mand1nga@xonotic.org>
Wed, 20 Apr 2011 05:28:02 +0000 (02:28 -0300)
commit1ce451290a21e3e2ce094eb3c87116fb786723bd
treed0da0f014e96e29b3b85b87102334588e258eb45
parent978e0f542187c86755a47b411e274958399f5858
parent396be1f0fd806ebca957a7a065d6934a8e85e0c9
Merge branch 'master' into mand1nga/bot-debug
defaultXonotic.cfg