projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14ce4c2 011bb51)
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)

Trivial merge