Skip to content
Snippets Groups Projects
Commit 501b145a authored by Rainer Kartmann's avatar Rainer Kartmann
Browse files

Merge branch 'master' into location-graph-editor

# Conflicts:
#	source/Navigation/components/Navigator/Navigator.cpp
#	source/armarx/navigation/client/NavigationStackConfig.cpp
#	source/armarx/navigation/components/GraphImportExport/GraphImportExport.h
#	source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp
#	source/armarx/navigation/components/NavigationMemory/NavigationMemory.h
#	source/armarx/navigation/components/Navigator/Navigator.h
#	source/armarx/navigation/factories/NavigationStackFactory.cpp
#	source/armarx/navigation/global_planning/AStar.cpp
#	source/armarx/navigation/gui-plugins/LocationGraphEditor/widgets/ConnectDialog.h
#	source/armarx/navigation/server/event_publishing/MemoryPublisher.h
#	source/armarx/navigation/server/monitoring/GoalReachedMonitor.cpp
parents 8f5ead1f bfca141e
No related branches found
No related tags found
1 merge request!2Location graph editor
Showing
with 189 additions and 888 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