Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-11 02:06:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/scripts
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
..
+android Pre-merge cleanup 2018-01-14 19:48:12 -08:00
developer remove fresnel, add unlit, fix overlays, cleanup 2018-02-14 17:02:07 -08:00
modules
system Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-19 13:05:57 -08:00
tutorials remove cache buster 2018-01-31 22:00:30 +00:00
defaultScripts.js defang 2018-01-17 07:11:27 -08:00