]> 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: d6d9cfd 41f6eb0)
Merge remote-tracking branch 'origin/terencehill/menu_weaponarena_weapon_selection'
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:31:56 +0000 (19:31 -0400)

Trivial merge