Atlante45 4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f ... Conflicts: interface/src/avatar/Avatar.cpp interface/src/avatar/SkeletonModel.cpp		2014-11-19 17:28:24 -08:00
..
src	Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f	2014-11-19 17:28:24 -08:00
CMakeLists.txt	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00