[sdformat] 02/03: Merge tag 'upstream/3.1.1'

[Jose Luis Rivero]

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

jrivero-guest pushed a commit to branch master
in repository sdformat.

commit d3e4e858493c4875a3fc12b0a5eaa8d7a3f88aa9
Merge: 7bf28aa a3acf14
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Aug 24 17:56:15 2015 +0200

    Merge tag 'upstream/3.1.1'
    
    Upstream version 3.1.1

 .hg_archival.txt           |  4 ++--
 .hgtags                    |  2 ++
 CMakeLists.txt             |  4 ++--
 Changelog.md               |  9 ++++++++-
 sdf/1.5/CMakeLists.txt     |  1 +
 sdf/1.5/logical_camera.sdf | 19 +++++++++++++++++++
 sdf/1.5/sensor.sdf         |  2 ++
 src/CMakeLists.txt         |  5 ++++-
 8 files changed, 40 insertions(+), 6 deletions(-)

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