Ken Cooke 45db8c3bef Rebase optimizations on NVTT 2.1.0 instead of master		2017-06-05 11:18:54 -07:00
..
android	use libc++ and clang toolchain	2016-08-31 16:16:40 -07:00
externals	Rebase optimizations on NVTT 2.1.0 instead of master	2017-06-05 11:18:54 -07:00
installer	lots	2016-03-31 09:21:08 -07:00
macros	Remove faceshift	2017-04-28 16:34:54 -07:00
modules	Merge pull request #10243 from birarda/bake-textures	2017-05-12 12:26:33 -07:00
templates	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-12-01 09:45:50 -08:00