Merge branch 'transientdesigner_with_filter'
commitd366155eb0e8f45cb69f73d44faec43ec4c188b2
authorMarkus Schmidt <schmidt@boomshop.net>
Wed, 11 Mar 2015 02:46:23 +0000 (11 03:46 +0100)
committerMarkus Schmidt <schmidt@boomshop.net>
Wed, 11 Mar 2015 02:46:23 +0000 (11 03:46 +0100)
tree9c12198e4f256587900796674f7d55fbeae376a4
parent314d2ed14a39bd6c6c6d8a5ca61599051794ca1f
parent8457071fcfd51728f87cd86d26e1ec1c496521fe
Merge branch 'transientdesigner_with_filter'

Conflicts:
src/audio_fx.cpp