]> 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: 4ab1d5e 4225c1a)
Merge branch 'Mario/weapon_fields'
authorMario <mario@smbclan.net>
Fri, 16 Feb 2018 06:41:32 +0000 (16:41 +1000)
committerMario <mario@smbclan.net>
Fri, 16 Feb 2018 06:41:32 +0000 (16:41 +1000)

Trivial merge