Philip Rosedale 73c4e55da4 Fixing merge conflicts		2012-11-07 10:48:24 -08:00
..
philip.xcuserdatad	Fixing merge conflicts	2012-11-07 10:48:24 -08:00
Seiji.xcuserdatad	Minor changes: added an additional audio buffer (captures audio input), with a corresponding read method. This buffer is optional, and toggleable via a preprocessor macro. Also added const-correctness for Audio write methods.	2012-09-07 16:15:19 -07:00