Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-04 14:35:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
50852 commits 25 branches 28 tags 1.2 GiB
Commit graph

1252 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