Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 05:53:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
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
..
compiledResources Pre-merge cleanup 2018-01-14 19:48:12 -08:00
external GLAD polish 2018-01-14 00:10:05 -08:00
i18n
icon
resources Merge pull request #12401 from SamGondelman/decals 2018-02-19 10:58:02 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-19 13:05:57 -08:00
ui
CMakeLists.txt pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
interface.exe.manifest