Atlante45 844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar ... Conflicts: assignment-client/src/Agent.cpp examples/editModels.js		2014-07-28 10:11:39 -07:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar	2014-07-28 10:11:39 -07:00
CMakeLists.txt	put back ssize_t definition	2014-05-20 11:56:06 -07:00