Leonardo Murillo 418b9c8fea Merge branch 'master' of https://github.com/highfidelity/hifi		2015-12-01 11:57:38 -06:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	cmake: Fix quazip configure on linux/mac if QT_CMAKE_PREFIX_PATH is undefined.	2015-11-30 11:14:35 -08:00
macros	Some fixes	2015-11-30 10:07:11 -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