Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 07:25:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/gpu
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
..
src/gpu Merge remote-tracking branch 'upstream/master' into plugins 2015-07-16 16:37:55 -07:00
CMakeLists.txt Trying to fixup the plugins compilation 2015-07-02 00:00:00 -07:00