Brad Davis adb6a6ee54 Hopefully fixing win32 build		2015-03-09 17:27:10 -07:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Hopefully fixing win32 build	2015-03-09 17:27:10 -07:00
macros	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-26 14:19:23 -08:00
modules	Updating cmake config to build from pre-compiled Oculus SDK distribution	2015-03-09 14:46:43 -07:00
templates	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00