Leonardo Murillo 6a53140720 Merge branch 'master' of https://github.com/highfidelity/hifi		2015-11-30 08:38:13 -06:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Configure fix for quazip	2015-11-27 20:57:35 -08:00
macros	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-11-30 08:38:13 -06:00
modules	Bundling and consolidating deployment package	2015-11-20 15:10:56 -06:00
templates	Have stack manager use bundled stack	2015-11-27 14:04:33 -06:00