Brad Davis f22682fe39 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h		2015-06-01 22:59:10 -07:00
..
boostconfig	Working towards display plugins	2015-05-26 18:42:38 -07:00
bullet
glew
glm
gverb
LibOVR	Working on oculus rendering	2015-05-27 12:42:05 -07:00
oglplus	Working towards display plugins	2015-05-26 18:42:38 -07:00
openvr	Working towards display plugins	2015-05-26 18:42:38 -07:00
polyvox	update polyvox for xcode C++11 build	2015-06-01 14:53:11 -07:00
qxmpp
sdl2
soxr
tbb	attempt to make sure the ray that picks against polyvox entities is long enough	2015-05-27 14:57:12 -07:00
vhacd
OSXInstallNameChange.cmake	get polyvox to build on osx	2015-05-27 11:56:57 -07:00