]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 10 Jun 2010 00:55:48 +0000 (20:55 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 10 Jun 2010 00:55:48 +0000 (20:55 -0400)
commit1c4689c881297c46fffec3cf5a588967eb9d7dd0
treed32560b031319f5af293f8a4cdad134689cf2d57
parentd575356f674f0f39ca76c9e7bf1029d0b2b09dc6
parent8d871808b81981b390e6450daab616f68c621849
Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud