ZappoMan 5a246fab26 Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel ... Conflicts: tests/octree/src/main.cpp		2014-06-17 17:45:06 -07:00
..
metavoxels	Generics up and running.	2014-06-13 12:00:42 -07:00
octree	Merge branch 'master' of https://github.com/worklist/hifi into experimentalStoreModel	2014-06-17 17:45:06 -07:00
physics	Moved findRayIntersection() to the Shape classes	2014-06-17 12:36:36 -07:00
shared	added tests for MovingPercentile	2014-06-04 17:23:44 -07:00
CMakeLists.txt	complete quoting of varous Cmake commands, closes #1999	2014-03-03 12:15:05 -08:00