[proj] 02/04: Merge tag 'upstream/4.9.1_rc5' into experimental

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository proj.

commit 6f3e8ad1cf60ccad7c1a382dd61a6781cc2b263d
Merge: 8f419dc 810d66d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Mar 4 20:27:08 2015 +0100

    Merge tag 'upstream/4.9.1_rc5' into experimental
    
    Upstream version 4.9.1~rc5

 CMakeLists.txt                        |  6 ++++++
 cmake/CMakeLists.txt                  |  4 ++--
 cmake/project-config-version.cmake.in |  6 +++---
 cmake/project-config.cmake.in         | 29 ++++++++++++++++-------------
 jniwrap/doxygen.cfg                   |  2 +-
 nad/testvarious                       | 25 ++-----------------------
 nad/tv_out.dist                       | 17 ++---------------
 src/CMakeLists.txt                    |  6 ++++++
 src/pj_release.c                      |  2 +-
 9 files changed, 39 insertions(+), 58 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git