Sam Gateau 4619ba1f5b Merge branch 'master' of https://github.com/highfidelity/hifi into temp0		2015-03-03 10:56:04 -08:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	handle QTTOOLDIR env when looking for qmake	2015-02-26 16:59:37 -08:00
macros	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
modules	resolve conflicts on merge with upstream/master	2015-03-03 10:01:24 -08:00
templates	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00