overte/libraries/avatars
Andrew Meadows af3fae7bbf Merge upsteam master into current project (experimental hand paddles)
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
2014-01-14 16:39:46 -08:00
..
src Merge upsteam master into current project (experimental hand paddles) 2014-01-14 16:39:46 -08:00
CMakeLists.txt first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00