Merge remote-tracking branch 'origin/master' into grey/markers

.travis.yml

@@ -13,7 +13,7 @@ compiler:
   - clang
 
 env:
-  - BUILD_TYPE=Debug   COVERALLS=ON COVERALLS_REPO_TOKEN=FKh1HgwfV5uzNrYxIT6ZWjcFqybYZSUym
+  - BUILD_TYPE=Debug   COVERALLS=ON
   - BUILD_TYPE=Release COVERALLS=OFF
 
 matrix:

CMakeLists.txt

@@ -326,6 +326,7 @@ if(DOXYGEN_FOUND)
   set(DOXYGEN_DOXYFILE     ${PROJECT_BINARY_DIR}/doxygen/Doxyfile       )
   set(DOXYGEN_HTML_INDEX   ${PROJECT_SOURCE_DIR}/doxygen/html/index.html)
   set(DOXYGEN_OUTPUT_ROOT  ${PROJECT_SOURCE_DIR}/doxygen/html           ) # Pasted into Doxyfile.in
+  set(DOXYGEN_GENERATE_TAGFILE ${DOXYGEN_OUTPUT_ROOT}/${PROJECT_NAME}.tag)
   set(DOXYGEN_INPUT_ROOT   ${PROJECT_SOURCE_DIR}/dart                   ) # Pasted into Doxyfile.in
   set(DOXYGEN_EXTRA_INPUTS ${PROJECT_SOURCE_DIR}/doxygen/mainpage.dox   ) # Pasted into Doxyfile.in
 

Changelog.md

@@ -1,8 +1,12 @@
+## DART 6
+
 ### Version 6.0.0 (2015-12-19)
 
 1. Added missing `liburdfdom-dev` dependency in Ubuntu package
     * [Pull request #574](https://github.com/dartsim/dart/pull/574)
 
+## DART 5
+
 ### Version 5.1.1 (2015-11-06)
 
 1. Add bullet dependency to package.xml
@@ -300,6 +304,19 @@
 1. Added specification of minimum dependency version
     * [Pull request #306](https://github.com/dartsim/dart/pull/306)
 
+## DART 4
+
+### Version 4.3.6 (2016-04-16)
+
+1. Fixed duplicate entries in Skeleton::mBodyNodes causing segfault in destructor
+    * [Issue #671](https://github.com/dartsim/dart/issues/671)
+    * [Pull request #672](https://github.com/dartsim/dart/pull/672)
+
+### Version 4.3.5 (2016-01-09)
+
+1. Fixed incorrect applying of joint constraint impulses (backported from 6.0.0)
+    * [Pull request #578](https://github.com/dartsim/dart/pull/578)
+
 ### Version 4.3.4 (2015-01-24)
 
 1. Fixed build issue with gtest on Mac
@@ -424,6 +441,8 @@
   * [Issue #122](https://github.com/dartsim/dart/issues/122)
   * [Pull request #168](https://github.com/dartsim/dart/pull/168)
 
+## DART 3
+
 ### Version 3.0 (2013-11-04)
 
 1. Removed Transformation classes. Their functionality is now included in joint classes.
@@ -434,6 +453,8 @@
 1. Added constraint namespace
 1. Added "common" namespace
 
+## DART 2
+
 ### Version 2.6 (2013-09-07)
 
 1. Clean-up of build system:

debian/changelog

@@ -1,4 +1,4 @@
-dart (6.0.0) unstable; urgency=medium
+dart6 (6.0.0) unstable; urgency=medium
 
   * Added missing 'liburdfdom-dev' dependency in Ubuntu package
 
@@ -107,6 +107,18 @@ dart (5.0.0) unstable; urgency=low
 
  -- Jeongseok Lee <[email protected]>  Mon, 15 Jun 2015 23:40:00 -0500
 
+dart4 (4.3.6) unstable; urgency=medium
+
+  * Fixed duplicate entries in Skeleton::mBodyNodes causing segfault in destructor
+
+ -- Jeongseok Lee <[email protected]>  Sat, 16 Apr 2016 12:00:00 -0500
+
+dart4 (4.3.5) unstable; urgency=medium
+
+  * Fixed incorrect applying of joint constraint impulses (backported from 6.0.0)
+
+ -- Jeongseok Lee <[email protected]>  Sat, 9 Jan 2015 12:00:00 -0500
+
 dart (4.3.4) unstable; urgency=low
 
   * Fixed build issue with gtest on Mac