]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/fruitiex/balance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 27 Nov 2010 12:38:57 +0000 (13:38 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 27 Nov 2010 12:38:57 +0000 (13:38 +0100)
commit18976c01ddd9b119e2fb37eea11f97958400eb63
treeb88a75d31dea6814c3a081b139f1543a518d43f0
parent64ddbee7cf616535317f0367feb3dc106cdaaa42
parent5f2951fe5d33aab1f3935d77dc6312d16e94e77f
Merge remote branch 'origin/fruitiex/balance'