10 commits

Author	SHA1	Message	Date
Stephen Birarda	2bec2f0590	make model depend on octree for ViewFrustum	2015-07-14 17:21:46 -07:00
Sam Gateau	d8ebb0c5b9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
Sam Gateau	6070bf8a37	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-18 16:02:18 -08:00
Stephen Birarda	b2e587dbbd	remove use of include_dependency_includes and use cmake	2015-02-18 14:12:05 -08:00
Stephen Birarda	e99012efbb	updates to build guides to remove soxr	2015-02-17 10:33:12 -08:00
Stephen Birarda	8c998a65ee	use the glm find_package and check externals	2015-02-13 12:50:32 -08:00
Stephen Birarda	1d90c1c827	use glm external project in model library	2015-02-13 10:31:41 -08:00
Sam Gateau	e2e61c64b1	Support include path to shaders from the hifi libraries to cmake	2015-02-13 01:30:04 -08:00
Sam Gateau	4c670ac17a	merging with upstream master and origin temp0	2014-12-22 10:38:11 -08:00
Sam Gateau	967c6dbc4b	Add the Model library	2014-12-19 16:19:06 -08:00