overte/libraries/avatars
Brad Davis ccbae81dad Merge branch 'master' into HEAD
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
..
src Merge branch 'master' into HEAD 2015-10-29 10:24:38 -07:00
CMakeLists.txt Cleanup CMake files 2015-10-11 00:01:03 -07:00