overte-HifiExperiments/libraries/shared
ZappoMan 4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation
Conflicts:
	libraries/avatars/src/AvatarData.cpp
2013-05-20 13:55:01 -07:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 13:55:01 -07:00
CMakeLists.txt move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00