Commit graph

553 commits

Author SHA1 Message Date
ZappoMan
70e9781ad9 CR feedback new class names 2013-12-18 08:42:34 -08:00
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)