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
..
external
icon
resources	Working on line height	2015-07-17 14:33:32 -07:00
src	Merge branch 'rig' of github.com:howard-stearns/hifi into bromine	2015-07-24 10:06:02 -07:00
ui	Avatar collision sounds.	2015-06-26 16:23:16 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
interface_en.ts
InterfaceVersion.h.in