[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 f73601e4bcc6f08472d174e615827fd594707894
Merge: c0123de 5e4d655
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 13 16:18:56 2015 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs             |    2 +-
 configure                                   |   20 +-
 configure.ac                                |    2 +-
 irplib/irplib_utils.c                       |    1 +
 kmclipm/src/kmclipm_functions.c             |    2 +-
 kmos/Makefile.am                            |    8 +-
 kmos/Makefile.in                            |   29 +-
 kmos/kmo_dfs.c                              |    4 +-
 kmos/kmo_dfs.h                              |   12 +-
 kmos/kmo_functions.c                        |   28 +-
 kmos/kmo_functions.h                        |    3 +-
 kmos/kmo_priv_combine.c                     | 1252 ++++++------
 kmos/kmo_priv_multi_reconstruct.c           |  711 -------
 kmos/kmo_priv_multi_reconstruct.h           |   90 -
 kmos/kmos_oscan.c                           |  405 ++++
 kmos/kmos_oscan.h                           |   31 +
 kmos/tests/kmo_priv_combine-test.c          |    3 +-
 recipes/Makefile.am                         |   18 +-
 recipes/Makefile.in                         |   69 +-
 recipes/kmo_combine.c                       | 1091 ----------
 recipes/kmos_combine.c                      |  949 +++++++++
 recipes/kmos_dark.c                         |   90 +-
 recipes/kmos_reconstruct.c                  |   17 +-
 recipes/kmos_sci_red.c                      |   24 +-
 recipes/kmos_std_star.c                     |    5 +-
 recipes/kmos_test.c                         |  158 ++
 reflex/Makefile.am                          |   12 +-
 reflex/Makefile.in                          |   12 +-
 reflex/kmos.xml.in                          | 2876 ++++++++++++++++++++++-----
 reflex/{kmos_sci_red.py => kmos_combine.py} |  220 +-
 reflex/kmos_sci_red.py                      |   32 +-
 reflex/kmos_std_star.py                     |    4 +-
 tools/Makefile                              |   34 +-
 33 files changed, 4770 insertions(+), 3444 deletions(-)

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