Zach Fox f10b9ae30c Squashed commit of the following: ... commit 515ff016a4 Author: Zach Fox <fox@highfidelity.io> Date: Mon Nov 5 13:03:34 2018 -0800 Fix seven bugs commit a4d36b3845 Merge: 8906b909eb d0181283dd Author: Zach Fox <fox@highfidelity.io> Date: Mon Nov 5 10:25:58 2018 -0800 Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce commit d0181283dd Merge: be17ed0910 643026abd6 Author: Brad Hefta-Gaub <brad@highfidelity.io> Date: Fri Nov 2 16:44:31 2018 -0700 Merge pull request #14308 from sabrina-shanman/fbx2hfm (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes commit 643026abd6 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Wed Oct 31 14:15:30 2018 -0700 Change local variable in TestFbx for clarity commit 0b7ddca5f6 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Wed Oct 31 14:03:20 2018 -0700 Change naming for straggler names in model loading debug dumps commit becee7f010 Author: sabrina-shanman <sabrina@highfidelity.io> Date: Tue Oct 30 17:28:42 2018 -0700 Re-name FBXGeometry to HFMGeometry and do the same for related classes		2018-11-05 13:12:43 -08:00
..
checkout	Squashed commit of the following:	2018-11-05 13:12:43 -08:00
common	Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce	2018-11-02 16:49:20 -07:00
inspectionCertificate	Minor changes found by Chang	2018-11-02 09:33:06 -07:00
marketplaceItemTester	Revert "Better imports for controls and styles"	2018-10-23 10:58:28 -07:00
purchases	Merge branch 'oculus-store-commerce' into tabless	2018-11-01 11:22:28 -07:00
wallet	Squashed commit of the following:	2018-11-05 13:12:43 -08:00