Compile fix, need to use integer GL uniform.
Merge branch 'master' of https://github.com/worklist/hifi
Merge branch 'master' of https://github.com/worklist/hifi
Fixed bug with rendering stars on OS X: was using some weird extension on
Apple rather than standard VBOs.
Removed my temporary fix for pairing server bits.
Added newline at end of file; just trying to get this file out of the diff.
OK, I give up.
Merge pull request #194 from ey6es/master

Fix for starfield rendering on OS X.