]> 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: 14227f4 6a50f21)
Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di...
authorMario <mario.mario@y7mail.com>
Mon, 9 Dec 2013 07:13:48 +0000 (18:13 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 9 Dec 2013 07:13:48 +0000 (18:13 +1100)

Trivial merge