Merge branch 'hotfix/2.2.4' into develop

# Conflicts:
#	CMakeLists.txt
#	wrappers/ros/src/mynt_eye_ros_wrapper/src/wrapper_nodelet.cc
This commit is contained in:
John Zhao
2018-12-31 10:25:22 +08:00
5 changed files with 20 additions and 12 deletions

View File

@@ -38,7 +38,7 @@ PROJECT_NAME = "MYNT EYE S SDK"
# could be handy for archiving the generated documentation or if some version
# control system is used.
PROJECT_NUMBER = 2.2.3
PROJECT_NUMBER = 2.2.4
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a