[rospkg] branch master updated (1c2c3a1 -> 2b6d7f5)

[Jochen Sprickerhof]

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

jspricke-guest pushed a change to branch master
in repository rospkg.

      from  1c2c3a1   Deleted d version
      adds  162292c   Imported Upstream version 1.0.36
       new  60589ec   Merge tag 'upstream/1.0.36'
       new  2b6d7f5   Update changelog for 1.0.36-1 release

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis.yml             |  3 +--
 debian/changelog        | 35 +++--------------------------------
 doc/rospkg_packages.rst |  3 ++-
 src/rospkg/_version.py  |  2 +-
 src/rospkg/os_detect.py | 27 ++++++++++++++++++++-------
 src/rospkg/rospack.py   |  3 ++-
 6 files changed, 29 insertions(+), 44 deletions(-)

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