resolve EAGLView conflict with upstream
pulling upstream
Merge remote-tracking branch 'upstream/master'
test
 Please enter the commit message for your changes. Lines starting
resolve
resolve
SANG *) changed default value of ADSR control parameters, fixed ADSR to be a unit generator
SANG *) changed default value of ADSR control parameters, fixed ADSR to be a unit generator
Merge branch 'master' of https://github.com/gessl/urMus
SANG *) Fixed STK instruments from BlowHole to Clarinet
SANG *) working on clarinet, commit to pull upstream.
SANG *) working on clarinet, commit to pull upstream.
SANG *) working on flute, commit to pull upstream.
Merge branch 'master' of https://github.com/gessl/urMus
SANG *) done fixing STK
SANG *) done fixing STK, resolve ADSR trigger