]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: 86c9dc7)
Merge branch 'master' into Mario/vaporizer_damage
authorMario <zacjardine@y7mail.com>
Mon, 31 Aug 2015 14:15:08 +0000 (00:15 +1000)
committerMario <zacjardine@y7mail.com>
Mon, 31 Aug 2015 14:15:08 +0000 (00:15 +1000)
# Conflicts:
# qcsrc/common/weapons/w_vaporizer.qc
# qcsrc/server/cl_player.qc


No differences found