]> 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: eb3ae7a 4771a0c)
Merge branch 'Mario/weapon_animation_fix' into 'master'
authorMario <zacjardine@y7mail.com>
Tue, 21 Feb 2017 10:18:13 +0000 (10:18 +0000)
committerMario <zacjardine@y7mail.com>
Tue, 21 Feb 2017 10:18:13 +0000 (10:18 +0000)
Merge branch Mario/weapon_animation_fix (XS merge request)

See merge request !411


Trivial merge