[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 902430c3c60f6573bd83ec7baaaedd74900c0e38
Merge: 29eb4fe b5cfb2e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Feb 10 11:49:07 2015 +0100

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs                    |    2 +-
 calib/gasgano/config/kmos.oca                      |    2 +-
 configure                                          |   20 +-
 configure.ac                                       |    2 +-
 irplib/irplib_mkmaster.c                           |    5 +-
 irplib/tests/irplib_sdp_spectrum-test.c            |    3 +-
 kmos/Makefile.am                                   |    4 +-
 kmos/Makefile.in                                   |    8 +-
 kmos/kmo_dfs.c                                     |    4 +-
 kmos/kmo_dfs.h                                     |    2 +
 ...{kmo_priv_sky_tweak.c => kmos_priv_sky_tweak.c} |   39 +-
 ...{kmo_priv_sky_tweak.h => kmos_priv_sky_tweak.h} |    2 +-
 kmos/tests/Makefile.am                             |    8 +-
 kmos/tests/Makefile.in                             |   40 +-
 ...sky_tweak-test.c => kmos_priv_sky_tweak-test.c} |    8 +-
 recipes/Makefile.am                                |   18 +-
 recipes/Makefile.in                                |   60 +-
 recipes/kmo_extract_spec.c                         |    2 +-
 recipes/kmo_multi_reconstruct.c                    | 1570 ------------
 recipes/kmo_sci_red.c                              | 2599 --------------------
 recipes/kmos_sci_red.c                             | 2108 ++++++++++++++++
 recipes/kmos_sky_tweak.c                           |    4 +-
 reflex/Makefile.am                                 |    2 +-
 reflex/Makefile.in                                 |    2 +-
 reflex/kmos.xml.in                                 |  742 +-----
 reflex/{kmo_sci_red.py => kmos_sci_red.py}         |   54 +-
 reflex/kmos_wkf.oca                                |    2 +-
 tools/Makefile                                     |   34 +-
 28 files changed, 2337 insertions(+), 5009 deletions(-)

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