Merge branch 'master' into toward-3.0

poppy-project · Jan 20, 2017 · f2dbb60 · f2dbb60
2 parents 7d0ecd3 + a2177da
commit f2dbb60
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/changelog.md b/changelog.md
@@ -31,7 +31,7 @@
 * Fix offset/orientation issue in DummyController
 * Fix hostname resolution
 * Make initialization of synchronization loop more robust
-
+* Fix #155: Closing a DummyRobot raises an issue
 
 ## V 2.10
 ### Features

diff --git a/ci/before_install.sh b/ci/before_install.sh
@@ -33,7 +33,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
     # Use miniconda python (provide binaries for scipy and numpy on Linux)
     if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
-
         curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh
     else
         curl -L -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh