Stephen Birarda a141e3dc5d resolve conflicts on merge with upstream master		2013-06-13 16:31:40 -06:00
..
src	Converted double timestamps to long long (64 bit integers), fixed bug with	2013-06-13 11:11:59 -07:00
CMakeLists.txt	remove thread link to audio library	2013-06-11 14:50:10 -07:00