]> 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: 6c6c3e7 87845e2)
Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di...
authorSamual Lenks <samual@xonotic.org>
Sat, 29 Jun 2013 21:40:10 +0000 (17:40 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 29 Jun 2013 21:40:10 +0000 (17:40 -0400)

Trivial merge