Stephen Birarda 404fb2f781 Merge branch 'master' of https://github.com/highfidelity/hifi into console		2016-01-07 16:02:32 -08:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Merge branch 'master' of https://github.com/highfidelity/hifi into console	2016-01-07 16:02:32 -08:00
macros	Merge remote-tracking branch 'leo/master' into console	2016-01-04 09:57:55 -08:00
modules	Merge remote-tracking branch 'leo/master' into console	2016-01-04 09:57:55 -08:00
templates	Have stack manager use bundled stack	2015-11-27 14:04:33 -06:00