diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index bbd5802c8f4ce7d4afc75aab74b1b6ab7e179f55..b515ac383c2cfb14fae42222149d9bdaa117ac63 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -22,12 +22,11 @@ "/opt/ros/melodic/include", "/usr/include", "~/.conan/data/", - "/home/tim/.conan/data/gl3w/0.2/tuebel/testing/package/1a651c5b4129ad794b88522bece2281a7453aee4/include", + "/home/tim/.conan/data/scigl_render/0.5/tuebel/testing/source/include", + "/home/tim/.conan/data/gl3w/0.2/tuebel/testing/source/gl3w/include", "/home/tim/.conan/data/glm/0.9.9.1/g-truc/stable/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/include", - "/home/tim/.conan/data/Assimp/4.1.0/jacmoe/stable/package/2cc4fe4b4135f75ebb42e4641c98d88ea30a1a47/include", - "/home/tim/.conan/data/glfw/3.2.1/bincrafters/stable/package/76480ff7af5ef6b0a1c8bc2444dbd480a5eaef8b/include", - "/home/tim/.conan/data/filter_bay/0.2/tuebel/testing/package/5ab84d6acfe1f23c4fae0ab88f26e3a396351ac9/include", - "/home/tim/.conan/data/scigl_render/0.5/tuebel/testing/source/include" + "/home/tim/.conan/data/glfw/3.2.1/bincrafters/stable/package/0a813c597d519ec14c71192b99d7de0a92bbc1c3/include", + "/home/tim/.conan/data/filter_bay/0.2/tuebel/testing/source/include" ], "name": "Linux", "intelliSenseMode": "gcc-x64", diff --git a/src/robo_guide b/src/robo_guide index 753284c848c985164310cb477b29e1b0ae786a24..5928153be90ffc14103946f19abd6cc00fb8f198 160000 --- a/src/robo_guide +++ b/src/robo_guide @@ -1 +1 @@ -Subproject commit 753284c848c985164310cb477b29e1b0ae786a24 +Subproject commit 5928153be90ffc14103946f19abd6cc00fb8f198 diff --git a/src/scigl_render_ros b/src/scigl_render_ros index 35c267030697e376da412c03bb9a37d8f593a086..70f364499ada30fbf4df5c34480b11665f8408ac 160000 --- a/src/scigl_render_ros +++ b/src/scigl_render_ros @@ -1 +1 @@ -Subproject commit 35c267030697e376da412c03bb9a37d8f593a086 +Subproject commit 70f364499ada30fbf4df5c34480b11665f8408ac