[Debian-astro-commits] [cpl-plugin-kmos] 01/01: 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-kmos.

commit 0d0c37237622fa3ce41093dcb7c03bda5207130b
Merge: 856959d ca78f04
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 2 15:17:50 2015 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs        |    2 +-
 configure                              |   20 +-
 configure.ac                           |    2 +-
 irplib/irplib_utils.c                  |    4 +-
 kmclipm/src/kmclipm_priv_reconstruct.c |    7 +
 kmos/kmo_priv_std_star.c               |    2 +
 recipes/kmos_extract_spec.c            |  101 +-
 recipes/kmos_sci_red.c                 |   31 +-
 recipes/kmos_std_star.c                |  137 +-
 reflex/kmos.xml.in                     | 7788 +++++++++++++++++---------------
 reflex/kmos_sci_red.py                 |    5 +-
 reflex/kmos_std_star.py                |    8 +-
 reflex/kmos_wave_cal.py                |    4 +-
 tools/Makefile                         |   34 +-
 14 files changed, 4370 insertions(+), 3775 deletions(-)

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