Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 12:53:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/cmake
History
Brad Davis ae882c8347 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
	interface/src/ui/ApplicationCompositor.cpp
	interface/src/ui/overlays/LocalModelsOverlay.cpp
2015-07-16 16:37:55 -07:00
..
android make correct version of bullet for windows 2015-02-23 12:50:53 -08:00
externals Merge remote-tracking branch 'upstream/master' into plugins 2015-07-16 16:37:55 -07:00
macros Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
modules build separate debug and release versions of polyvox library 2015-07-15 09:42:26 -07:00
templates rename add paths macro for fixup_bundle 2015-02-23 13:24:21 -08:00