overte/libraries/avatars
ZappoMan 2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
2014-08-28 21:19:56 -07:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-28 21:19:56 -07:00
CMakeLists.txt remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00