Merge branch 'master' of https://github.com/worklist/hifi into glow
Merge branch 'master' of https://github.com/worklist/hifi into glow
Merge branch 'master' of https://github.com/worklist/hifi into glow
Starting on glow effect.
Merge branch 'master' of https://github.com/worklist/hifi into glow
Merge branch 'master' of https://github.com/worklist/hifi into glow
Basic glow effect.
Merge branch 'master' of https://github.com/worklist/hifi into glow
More efficiency for glow effect.
Merge branch 'master' of https://github.com/worklist/hifi into glow
Render to texture first, rather than copying from the frame buffer.  Copying
from the frame buffer requires it to have an alpha channel, which actually
does something on OS X (meaning we have to set it to 1.0).  We're going to
want to render to texture anyway for SSAO (or other effects).
Use glow effect for follow indicator.
Have the glow effect add half of the original texture, too, and use it on the
follow indicator.
Merge branch 'master' of https://github.com/worklist/hifi into glow
To keep the frame rate up, let's only sample eight points for the blur.
Merge pull request #850 from ey6es/glow

Added generic glow effect, enabled for voxel create/delete and follow indicators.
initial rev of Doxyfile to generate HTML documentation for our classes
Merge pull request #851 from birarda/master

intial rev of Doxyfile
Merge remote-tracking branch 'upstream/master'
Fix ifdef for sleep/wake notifier for Mac.