]> 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: 72646dc 9226d2a)
Merge remote-tracking branch 'origin/samual/lightning_gun' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:46:57 +0000 (21:46 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:46:57 +0000 (21:46 -0400)

Trivial merge