[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 593fa61be3b9c8cc4b75fca78e89462545bede88
Merge: 8cf5c05 aa298bd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Mar 25 16:57:38 2015 +0100

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs              |    2 +-
 calib/gasgano/config/kmos.oca                |    2 +-
 configure                                    |   20 +-
 configure.ac                                 |    2 +-
 kmos/kmo_dfs.c                               |    6 +-
 kmos/kmo_priv_combine.c                      |    9 +-
 kmos/kmo_priv_flat.c                         |    8 +-
 kmos/kmo_priv_std_star.c                     |  558 +++---
 kmos/kmo_priv_std_star.h                     |   13 +-
 kmos/kmo_priv_wave_cal.c                     |   29 +-
 kmos/tests/kmo_priv_std_star-test.c          |   64 -
 recipes/Makefile.am                          |   36 +-
 recipes/Makefile.in                          |  118 +-
 recipes/kmo_extract_spec.c                   |  787 --------
 recipes/kmo_reconstruct.c                    | 1092 ------------
 recipes/kmo_std_star.c                       | 2474 --------------------------
 recipes/kmos_dark.c                          |   22 +-
 recipes/kmos_extract_spec.c                  |  506 ++++++
 recipes/kmos_flat.c                          |   95 +-
 recipes/kmos_gen_reflines.c                  |    1 -
 recipes/kmos_illumination.c                  |   71 +-
 recipes/kmos_reconstruct.c                   |  761 ++++++++
 recipes/kmos_sci_red.c                       |  110 +-
 recipes/kmos_std_star.c                      | 1912 ++++++++++++++++++++
 recipes/kmos_wave_cal.c                      |   50 +-
 reflex/Makefile.am                           |    2 +-
 reflex/Makefile.in                           |    2 +-
 reflex/kmos.xml.in                           |  204 +--
 reflex/{kmo_std_star.py => kmos_std_star.py} |    2 +-
 reflex/kmos_wkf.oca                          |    2 +-
 tools/Makefile                               |   34 +-
 31 files changed, 3841 insertions(+), 5153 deletions(-)

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