Stephen Birarda 636d12510c Merge branch 'master' of https://github.com/highfidelity/hifi		2014-03-06 14:45:02 -08:00
..
macros	remove glm so it is referenced only externally	2014-03-04 15:19:47 -08:00
modules	find LibOVR depending on architecure and build type on Linux and Win	2014-03-06 14:31:26 -08:00