Merge remote-tracking branch 'origin/release-5.1' into release-6.4

# Conflicts: # CHANGELOG.md # CMakeLists.txt # package.xml
dartsim · Jan 7, 2018 · e65ae88 · e65ae88
2 parents f4e1a5d + 1c7a678
commit e65ae88
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -641,6 +641,11 @@
 
 ## DART 4
 
+### Version 4.3.7 (2018-01-05)
+
+1. Updated DART 4.3 to be compatible with urdf 1.0/tinyxml2 6/flann 1.9.1
+    * [Pull request #955](https://github.com/dartsim/dart/pull/955)
+
 ### Version 4.3.6 (2016-04-16)
 
 1. Fixed duplicate entries in Skeleton::mBodyNodes causing segfault in destructor

diff --git a/cmake/FindFLANN.cmake b/cmake/FindFLANN.cmake
@@ -38,4 +38,3 @@ find_package_handle_standard_args(FLANN
     FAIL_MESSAGE  DEFAULT_MSG
     REQUIRED_VARS FLANN_INCLUDE_DIRS FLANN_LIBRARIES
     VERSION_VAR   FLANN_VERSION)
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -38,4 +38,3 @@ find_package_handle_standard_args(FLANN
		FAIL_MESSAGE DEFAULT_MSG
		REQUIRED_VARS FLANN_INCLUDE_DIRS FLANN_LIBRARIES
		VERSION_VAR FLANN_VERSION)