Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-15 13:20:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7897 commits 25 branches 0 tags 1.1 GiB
Commit graph

2 commits

Author SHA1 Message Date
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
f469553b8c CR feedback 2013-12-17 14:27:54 -08:00
Renamed from libraries/scriptengine/src/ScriptEngine.cpp (Browse further)