]> 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 | compact (merge: a3eef12 b0c2a2d)
Merge branch 'Mario/balance_v2' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:24 +0000 (07:03 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:03:24 +0000 (07:03 +0000)
Merge branch Mario/balance_v2 (Small merge request)

Some small adjustments to the weapon balance (mainly for the arc).

See merge request !281


Trivial merge