added command line options for jurisdiction settings
added command line options for jurisdiction settings
added command line options for jurisdiction settings
added command line options for jurisdiction settings
Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers
add menu option to mix RAW audio with microphone audio
add option to audio menu to stop the mixed audio
some comments and _songFileBytes reset
resolve conflicts on merge with upstream master
Merge pull request #756 from ZappoMan/multiple_voxel_servers

command line options for jurisdictions
Merge pull request #763 from birarda/rave-audio

add a menu option to mix RAW audio file with microphone audio
Switch back to avatar.getEyePosition() rather than
avatar.getHead().getEyePosition() because of mysterious lag.
Merge remote-tracking branch 'upstream/master'