[gazebo] 01/01: Merge branch 'upstream' into dfsg_clean

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch dfsg_clean
in repository gazebo.

commit 42b44d3617fdfae852c402630ef5b77cbbdb7c4e
Merge: 759748c 9af8dcd
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Thu Sep 15 21:55:34 2016 +0000

    Merge branch 'upstream' into dfsg_clean

 .hg_archival.txt                     |  6 +++---
 CMakeLists.txt                       |  2 +-
 Changelog.md                         |  9 +++++++++
 gazebo/gui/ApplyWrenchDialog_TEST.cc |  5 ++++-
 gazebo/gui/GLWidget.cc               | 21 ++++++++++++---------
 gazebo/gui/MainWindow_TEST.cc        | 32 ++++++++++++++++++++++++++++++++
 gazebo/gui/MainWindow_TEST.hh        |  3 +++
 7 files changed, 64 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git