overte/libraries/animation
Andrew Meadows 7410baedf0 merge highfidelity/master into andrew/copernicium
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
	libraries/animation/src/Rig.cpp
	libraries/animation/src/Rig.h
2015-09-01 11:08:01 -07:00
..
src merge highfidelity/master into andrew/copernicium 2015-09-01 11:08:01 -07:00
CMakeLists.txt call setup_memory_debugger from common macros rather than from every CMakeLists.txt file 2015-08-26 11:09:59 -07:00