]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 13:04:28 +0000 (16:04 +0300)
committerFruitieX <fruitiex@gmail.com>
Sat, 14 May 2011 13:04:28 +0000 (16:04 +0300)
commit48fccca0eefd5b290d47ff7f86064962f9c8a0e1
tree750139fcb310fdd4af54839766932e420d1a8ede
parentba32536fe000fd90a7babd4d7ba442578a56a4d5
parentc52282ec6b0a0e7e0a2c0f4ba634b4fac47f4c2f
Merge remote-tracking branch 'origin/terencehill/newpanelhud' into fruitiex/panelhud