]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/samual/balance'
authormand1nga <mand1nga@xonotic.org>
Mon, 4 Apr 2011 00:38:36 +0000 (21:38 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 4 Apr 2011 00:38:36 +0000 (21:38 -0300)
commit074459aab85964e07860bfaeae24bcdcd1940f4b
tree73e94111faf39cf7e838f7b1df2e66d04e21db9d
parent4a26c1a9c8ae3074931fe8295567935567d58f8b
parentfd27411139ec31c09c2edc6f7452b4b2ae315406
Merge remote branch 'origin/samual/balance'