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
*) Fixed Blit, BlitSaw, and BlitSq for normalization and removed spurious In input as part of STK integration improvement. BlowBotl now has amplitude and rate controls.
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