]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/samual/balance'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 12:42:05 +0000 (14:42 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 29 Aug 2011 12:42:05 +0000 (14:42 +0200)
commit998e124b71488ff00eeb48a6a7d606cbe1ef90f2
treeb52ca5f8e0eb93919319eb6617a0473cb04d583f
parent7bec16e96b757f302d362ac4ab0709e5905ee546
parent1bf29808a70ebd0b309c3a99190d4fc15fadb1f2
Merge remote branch 'origin/samual/balance'