[med-svn] [libbpp-raa] 05/13: Merge tag 'upstream/2.2.0'

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libbpp-raa.

commit 25ff92f22f4b7d69ebcd8875173441c3c9afda5b
Merge: 57952c3 b6dfbc4
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 21 17:39:35 2016 +0200

    Merge tag 'upstream/2.2.0'
    
    Upstream version 2.2.0
    
    Conflicts:
    	debian/changelog
    	debian/control

 CMakeLists.txt   |  4 ++--
 Doxyfile         |  2 +-
 bpp-raa.spec     |  4 +++-
 debian/control   |  4 ++--
 debian/copyright |  6 +++---
 debian/postinst  | 22 ++++++++++++++++++----
 debian/postrm    | 26 ++++++++++++++++++++------
 debian/prerm     | 22 ++++++++++++++++++----
 debian/rules     |  4 +++-
 9 files changed, 70 insertions(+), 24 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libbpp-raa.git