NissimHadar cc3a74b7a0 Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid		2019-02-05 09:01:46 -08:00
..
externals	PR feedback	2018-11-08 12:47:53 -08:00
installer	Implement CR comments for installer text logging	2018-10-30 12:13:46 -07:00
macros	Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid	2019-02-05 09:01:46 -08:00
modules	Vcpkg migration	2018-11-08 12:28:06 -08:00
ports	Fix hash	2019-01-24 13:00:19 -08:00
templates	Add logging for install options	2018-10-31 11:07:26 -07:00
compiler.cmake	Merge pull request #14183 from Atlante45/feat/ccache	2018-10-23 13:33:46 -07:00
init.cmake	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00