[Debian-astro-commits] [cpl-plugin-kmos] 01/02: 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 c585a2d850f6d2af72dfef33756c078ec71b495a
Merge: 84b87c1 c992692
Author: Ole Streicher <ole at aip.de>
Date:   Mon Jan 25 11:35:31 2016 +0100

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs |    2 +-
 configure                       |   20 +-
 configure.ac                    |    2 +-
 irplib/irplib_slitpos.c         |    3 +
 kmos/kmo_dfs.c                  |  226 ++--
 kmos/kmo_dfs.h                  |    2 +
 kmos/kmo_utils.c                |  285 +++++
 kmos/kmo_utils.h                |    7 +
 kmos/kmos_pfits.c               |   12 +
 kmos/kmos_pfits.h               |    1 +
 kmos/kmos_priv_sky_tweak.c      |   88 +-
 kmos/kmos_priv_sky_tweak.h      |    3 +-
 recipes/Makefile.am             |    6 -
 recipes/Makefile.in             |   17 +-
 recipes/kmo_fits_stack.c        |  366 ------
 recipes/kmos_combine.c          |  347 ++++--
 recipes/kmos_sci_red.c          |  312 ++---
 recipes/kmos_sky_tweak.c        |   14 +-
 recipes/kmos_wave_cal.c         |   18 +-
 reflex/Makefile.in              |    2 +-
 reflex/README                   |    9 +
 reflex/kmos.xml.in              | 2521 ++++++++++++++++++++++++---------------
 reflex/kmos_combine.py          |  473 ++++++--
 reflex/kmos_sci_red.py          |   63 +-
 reflex/kmos_std_star.py         |   27 +-
 tools/Makefile                  |   34 +-
 26 files changed, 2790 insertions(+), 2070 deletions(-)

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