Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 06:18:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/entities-renderer
History
Clément Brisset 5f16b8752b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 
Conflicts:
	libraries/entities-renderer/src/RenderableEntityItem.cpp
	libraries/render-utils/src/Model.cpp
2015-06-05 13:28:42 +01:00
..
src Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-05 13:28:42 +01:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-06-02 11:25:23 -07:00