# Conflicts:
#	source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
#	source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
#	source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
#	source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
#	source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
#	source/RobotAPI/libraries/armem/CMakeLists.txt
#	source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp