]> 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: 1b0c1bf f089392)
Merge branch 'samual/weapons' into Mario/weapons
authorSamual Lenks <samual@xonotic.org>
Tue, 1 Apr 2014 03:01:47 +0000 (23:01 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 1 Apr 2014 03:01:47 +0000 (23:01 -0400)

Trivial merge