Rebase to master, fix merge conflicts

This commit is contained in:
Ameer
2020-07-08 21:15:49 -04:00
26 changed files with 797 additions and 315 deletions

View File

@ -7,6 +7,7 @@
#include <functional>
#include <mutex>
#include <thread>
#include <unordered_map>
#include <libusb.h>
#include "common/common_types.h"
#include "common/threadsafe_queue.h"