Atlante45 ab76e6a00c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday ... Conflicts: interface/src/Audio.cpp		2014-04-21 12:19:19 -07:00
..
AbstractAudioInterface.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
AudioInjector.cpp	Removed gettimeofday in AudioInjector	2014-04-16 12:01:41 -07:00
AudioInjector.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
AudioInjectorOptions.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
AudioInjectorOptions.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
AudioRingBuffer.cpp	some cleanup	2014-04-15 13:36:20 -07:00
AudioRingBuffer.h	some cleanup	2014-04-15 13:36:20 -07:00
AudioScriptingInterface.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
AudioScriptingInterface.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
InjectedAudioRingBuffer.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
InjectedAudioRingBuffer.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
MixedAudioRingBuffer.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
MixedAudioRingBuffer.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
PositionalAudioRingBuffer.cpp	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
PositionalAudioRingBuffer.h	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Sound.cpp	change Sound property to hasDownloaded	2014-04-18 14:46:56 -07:00
Sound.h	fix property in sound	2014-04-18 14:48:26 -07:00