Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-12 21:48:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/model
History
Brad Davis 180f912924 Merge remote-tracking branch 'upstream/master' into core 
Conflicts:
	interface/src/ui/overlays/Circle3DOverlay.cpp
	libraries/gpu/src/gpu/Format.h
	libraries/render-utils/src/GeometryCache.cpp
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/text/Font.cpp
2015-08-01 20:01:59 -07:00
..
src/model
CMakeLists.txt