]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill...
authorterencehill <piuntn@gmail.com>
Sun, 1 May 2011 22:38:02 +0000 (00:38 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 1 May 2011 22:38:02 +0000 (00:38 +0200)
commitacad3d9e40b3914f621d7a672453b48f22b2dc54
treefd4043fe047a7fbbf049d8430da882d3be754750
parent6ace6194875c750e6ac26b2f9353d259845aa4fd
parent683672ff5de2463c9c29cd27bc96b658e61bac98
Merge remote-tracking branch 'remotes/origin/fruitiex/panelhud' into terencehill/newpanelhud

Conflicts:
qcsrc/common/constants.qh