]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit8ac243b6afb0ad56c6130ba5436d88ce4647bc32
tree2b9c5bcb62758634ed3796c1be851cb0b7e46ebb
parenteb3ae7a87171636d6185f543dd5c7382929ecd1a
parent4771a0c8d75109d21a33220c30c7d81b13e2ed70
Merge branch 'Mario/weapon_animation_fix' into 'master'

Merge branch Mario/weapon_animation_fix (XS merge request)

See merge request !411