Removed TODO
Additional documentation
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/matsukaze/hifi_nocr
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
quite the error messages about faild locks
Job #19574. Add audio oscilloscope.'
Merge branch 'master' of https://github.com/highfidelity/hifi
Reverting inadvertently committed local changes.
fix headers
Merge pull request #2713 from ZappoMan/fixheaders

fix headers
Merge pull request #2711 from ZappoMan/quiet_logs

quite the error messages about failed locks
Changed constant names for improved readability.
Changed const color data and method signatures.

Changed constant color data and method signatures from unsigned int to
array of float. Changed glColor4f to glColor4fv.
Expanded variable names.
Merge pull request #2712 from matsukaze/master

Job #19574. Add new audio oscilloscope.
Removed UTF-8 new line characters, QT script errors on those lines in Windows.