samcake 25eb569433 Merge branch 'master' of https://github.com/highfidelity/hifi into color		2016-06-02 10:38:40 -07:00
..
src/model-networking	adding texcoord 1 on all the material/model and go fetch occlusion map with this uv instead of texcoor0. this allow for separate transforms just for occlusoin map	2016-05-16 15:42:48 -07:00
CMakeLists.txt	remove some unnecessary dependencies	2016-05-14 14:50:02 -07:00