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

Merge branch 'devel' into... 

Merge branch 'devel' into 191-emplace-api-inconsistent-with-processortrackerfeature-landmark-functions

Conflicts:
	include/core/landmark/landmark_base.h
	src/landmark/landmark_base.cpp
	src/map/map_base.cpp
	src/processor/processor_tracker_feature_dummy.cpp
	src/processor/processor_tracker_landmark.cpp
parents 9541801a 0e2ba89e
No related branches found
No related tags found
1 merge request!274Resolve "Emplace API inconsistent with ProcessorTrackerFeature/Landmark functions"
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 4445 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment