]> 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: bb45719 db3d8b6)
Merge remote branch 'origin/terencehill/essential_weapons_panel'
authorSamual <samual@xonotic.org>
Mon, 12 Sep 2011 07:25:55 +0000 (03:25 -0400)
committerSamual <samual@xonotic.org>
Mon, 12 Sep 2011 07:25:55 +0000 (03:25 -0400)

Trivial merge