Merge branch 'develop' into devel-s210a-merge

2018-12-17 18:00:37 +08:00
parent f59c918e81 f6abc57475
commit 1c17308a02
58 changed files with 7524 additions and 14 deletions
--- a/include/mynteye/api/api.h
+++ b/include/mynteye/api/api.h
@@ -15,6 +15,7 @@
 #define MYNTEYE_API_API_H_
 #pragma once

+#include <functional>
 #include <limits>
 #include <memory>
 #include <string>