Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 06:22:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/interface
History
Brad Hefta-Gaub 54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
2015-09-14 21:13:08 -07:00
..
external Update readme.txt 2015-09-15 00:29:12 +02:00
i18n moved translation efforts into subdir 2015-08-25 01:36:19 +02:00
icon
resources Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 2015-09-14 21:13:08 -07:00
ui apperance => appearance 2015-08-13 14:42:37 -07:00
CMakeLists.txt Procedural skybox work 2015-09-08 14:31:16 -07:00