Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-09 19:42:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries/graphics
History
Nissim Hadar b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
..
src/graphics Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-19 13:05:57 -08:00
CMakeLists.txt rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00