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

a78936e1 · Nikhil Ambardar · 1d7df964 · 3ee77d5d · a78936e1 · a78936e1
Commit a78936e1 authored 4 years ago by Nikhil Ambardar
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,4 +227,3 @@ target_link_libraries(testappm ${catkin_LIBRARIES} )

 ## Add folders to be run by python nosetests
 # catkin_add_nosetests(test)
-
--- a/launch/.gitkeep
+++ b/launch/.gitkeep
--- a/src/datalink/joint.h
+++ b/src/datalink/joint.h
--- a/src/datalink/obstacle.h
+++ b/src/datalink/obstacle.h