Brad Davis 155f88e267 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/devices/TV3DManager.h libraries/gpu/src/gpu/GPUConfig.h		2015-07-31 10:28:06 -07:00
..
android	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
externals	Make OpenVR windows only for now	2015-07-27 09:13:04 -04:00
macros	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
modules	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-29 14:04:20 -07:00
templates	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00