overte-JulianGro/cmake/externals
Bradley Austin Davis 7e60aee1bf Merge branch 'master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
2015-08-06 11:03:37 -07:00
..
boostconfig
bullet
glew repairs for build type of glew external 2015-08-05 14:30:36 -07:00
glm
gverb
LibOVR
oglplus
openvr
polyvox
qxmpp
sdl2
sixense
soxr
tbb
vhacd
zlib Fix MD5 of glew dep 2015-08-05 14:02:14 -07:00
OSXInstallNameChange.cmake