overte-HifiExperiments/libraries/shared
Andrew Meadows aad9d0441e merge upstream/master to andrew/bispinor
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
2014-05-14 09:38:31 -07:00
..
external move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
src merge upstream/master to andrew/bispinor 2014-05-14 09:38:31 -07:00
CMakeLists.txt add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00