Sam Gateau d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0		2015-02-26 14:19:23 -08:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	correct QXmpp DLL path for windows	2015-02-23 13:04:12 -08:00
macros	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
modules	Merge branch 'master' of https://github.com/highfidelity/hifi into 20305	2015-02-26 22:16:35 +05:30
templates	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00