[Debian-astro-commits] [cpl-plugin-uves] 03/05: Merge branch 'upstream' into debian

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository cpl-plugin-uves.

commit 2da46255fa8683b5f3bdc872f912c8c2138f270a
Merge: 1607787 7aebc61
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 23 11:32:03 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                       |   3 +
 calib/gasgano/config/UVES.prefs |   2 +-
 configure                       |  20 +-
 configure.ac                    |   2 +-
 irplib/irplib_utils.c           |   1 +
 reflex/uves-fibre.xml.in        | 581 ++++++++++++++++++++++++++++++++--------
 reflex/uves.xml                 | 447 +++++++++++++++++++++++++++----
 reflex/uves.xml.in              | 433 +++++++++++++++++++++++++++---
 8 files changed, 1275 insertions(+), 214 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-uves.git