Ryan Huffman 196161fe93 Merge pull request #66 from birarda/console-dev ... some initial packaging work and console fixes		2016-01-14 10:17:24 -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	handle beta icon usage while packaging console	2016-01-05 10:27:46 -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