Stephen Birarda 5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake		2017-09-07 12:06:53 -07:00
..
android	use libc++ and clang toolchain	2016-08-31 16:16:40 -07:00
externals	compare MSVC version numerically with greater_equal	2017-08-10 09:46:58 -07:00
installer	lots	2016-03-31 09:21:08 -07:00
macros	Correct desktop icon name	2017-08-11 15:37:55 -07:00
modules	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
templates	Changed string name	2017-09-07 18:53:05 +01:00