]> 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: b1f4bb8 c72423e)
Merge branch 'Lyberta/OKShotgunAmmoUsage' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 28 Jun 2017 22:10:15 +0000 (22:10 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 28 Jun 2017 22:10:15 +0000 (22:10 +0000)
Lowered OK shotgun ammo usage

See merge request !449


Trivial merge