Skip to content
Snippets Groups Projects
Commit 901e1efa authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge remote-tracking branch 'origin/devel' into...

Merge remote-tracking branch 'origin/devel' into 191-emplace-api-inconsistent-with-processortrackerfeature-landmark-functions

Conflicts:
	include/core/processor/track_matrix.h
	src/processor/processor_tracker.cpp
	src/processor/track_matrix.cpp
	src/sensor/sensor_base.cpp
	test/gtest_track_matrix.cpp
parents b044a04c 6601a925
No related branches found
No related tags found
Loading
Checking pipeline status
Showing
with 412 additions and 346 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment