]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ace619 683672f)
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)
Conflicts:
qcsrc/common/constants.qh


Trivial merge