]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Wed, 16 Jun 2010 23:45:57 +0000 (01:45 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 16 Jun 2010 23:45:57 +0000 (01:45 +0200)
commit353583ae1fbdd0c6fc7c2b53148e4e5e868eec99
tree667ddda3501763f8ddb963dcd400dbae63adf57c
parent14ce4c2f16825ce455d4dfef657284bf7a6c1f81
parent011bb51c9e023621a130c1bfe280840dbbe36b5c
Merge remote branch 'remotes/origin/fruitiex/newpanelhud' into terencehill/newpanelhud