Merge branch 'master' into terencehill/slider_anim_improvements
authorterencehill <piuntn@gmail.com>
Wed, 26 Aug 2015 12:24:11 +0000 (14:24 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 26 Aug 2015 12:24:11 +0000 (14:24 +0200)
commit08e6497842b33529d0c1b0caa431b49ca98d79da
tree30b69f39c952c683704ce67aa28c1142328108de
parentd4d9085c62eac8bbe0ef559f42de20aeb1308bcb
parent1df4fb3cec6f442b521cd1f956d47c72776ada88
Merge branch 'master' into terencehill/slider_anim_improvements

Conflicts:
qcsrc/menu/anim/animation.qc
qcsrc/menu/anim/animation.qc
qcsrc/menu/item/slider.qc