Skip to content
Snippets Groups Projects

Resolve "Emplace API inconsistent with ProcessorTrackerFeature/Landmark functions"

Merged Resolve "Emplace API inconsistent with ProcessorTrackerFeature/Landmark functions"
191-emplace-api-inconsistent-with-processortrackerfeature-landmark-functions into devel
Merged Joan Vallvé Navarro requested to merge 191-emplace-api-inconsistent-with-processortrackerfeature-landmark-functions into devel
Viewing commit 901e1efa
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
29
  • 901e1efa 
    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