Andrew Meadows 1bf49d72f1 Merge branch 'rig' of github.com:howard-stearns/hifi into bromine ... Conflicts: interface/src/avatar/SkeletonModel.cpp		2015-07-24 10:06:02 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	Merge branch 'rig' of github.com:howard-stearns/hifi into bromine	2015-07-24 10:06:02 -07:00
CMakeLists.txt	add a missing library link	2015-07-15 15:58:05 -07:00