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 3f4118a7
Prev Next
Show latest version
Compare changes
  • Side-by-side
  • Inline
Files
62
  • 3f4118a7
    Joan Vallvé Navarro
    Merge branch 'devel' into... · 3f4118a7
    Joan Vallvé Navarro authored 
    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