Leonardo Murillo bce808cdbe Merge branch 'master' of https://github.com/murillodigital/hifi		2015-12-11 08:42:40 -08:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Merge pull request #6623 from ZappoMan/switchToJulySixenseSDK	2015-12-10 21:21:01 -08:00
macros	Changes for SSL and icons	2015-12-02 12:43:25 -06:00
modules	DO NOT MERGE - Testing PR environment	2015-12-09 11:07:10 -08:00
templates	Have stack manager use bundled stack	2015-11-27 14:04:33 -06:00