Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

e06d70bd · Mirko Wächter · 5a91698d · b3ab8e8a · e06d70bd
Commit e06d70bd authored 8 years ago by Mirko Wächter
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ set(ARMARX_ENABLE_AUTO_CODE_FORMATTING TRUE)
 armarx_project("RobotAPI")
 depends_on_armarx_package(ArmarXGui "OPTIONAL")

-set(ArmarX_Simox_VERSION 2.3.34)
+set(ArmarX_Simox_VERSION 2.3.36)

 find_package(Simox ${ArmarX_Simox_VERSION} QUIET)
 if (Simox_FOUND)