Leonardo Murillo ec6f572d68 Merge branch 'master' of https://github.com/highfidelity/hifi		2015-12-23 08:26:24 -06:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	remove qxmpp external	2015-12-18 10:54:04 -08:00
macros	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-12-19 18:44:21 -06:00
modules	Consolidating installer checkpoint	2015-12-16 14:26:24 -06:00
templates	Have stack manager use bundled stack	2015-11-27 14:04:33 -06:00