5 commits

Author	SHA1	Message	Date
samcake	c627a555bf	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-05-16 16:27:51 -07:00
samcake	c6a081fb46	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2016-05-11 16:56:37 -07:00
samcake	a8347cac6e	Getting the unlit to work from the pipeline, and found the isLinear for texture bug!	2016-05-06 18:36:55 -07:00
Andrew Meadows	e87b06657c	remove whitespace and fix formatting	2016-04-26 11:24:38 -07:00
Andrew Meadows	0cc12fdaa6	move from examples/ to scripts/developer/	2016-04-25 17:36:35 -07:00