Merge upstream and resolve merge conflicts.

2026-11-03 07:51:36 +08:00 · 2016-02-23 19:29:30 -07:00
parent 4ce4724105 237ecfef1a
commit fad1c87631
26 changed files with 1867 additions and 131 deletions
@@ -41,9 +41,8 @@

 #include <stdint.h>
 #include <matrix/matrix/math.hpp>
-#include <geo/geo.h>
 #include "RingBuffer.h"
-
+#include "geo.h"
 #include "common.h"

 using namespace estimator;