Merge branch 'master' of https://git-st.inf.tu-dresden.de/nikaviator/zero

CMakeLists.txt

@@ -199,8 +199,8 @@ add_executable(testappm
 ## Specify libraries to link a library or executable target against
 
 target_link_libraries(testappm ${catkin_LIBRARIES} )
-
-target_link_libraries(robot_models_node ${catkin_LIBRARIES} )
+==== BASE ====
+==== BASE ====
 #add_dependencies(robot_models_node ${catkin_LIBRARIES})
 
 #############

src/datalink/robot.h

@@ -23,4 +23,4 @@ public:
     bool of,moving,grasppos;
     std::string planninggrp;
 };
-#endif //ROBOT_MODELS_TEST_H
\ No newline at end of file
+#endif //ROBOT_MODELS_TEST_H

src/robot_models_node.cpp

@@ -266,4 +266,4 @@
             rate.sleep();
         }
 return 0;
-}
+}
\ No newline at end of file