[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 c6fe5e7c97e50d5f3ccd7cbeb14acf8612b90954
Merge: 8d8e81b 327a3ec
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Dec 4 11:38:05 2014 +0100

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs         |    2 +-
 configure                               |   20 +-
 configure.ac                            |    2 +-
 irplib/Makefile.am                      |    8 +-
 irplib/Makefile.in                      |   12 +-
 irplib/irplib_calib.c                   |  103 +-
 irplib/irplib_cat.c                     |   20 +-
 irplib/irplib_distortion.c              |   20 +-
 irplib/irplib_flat.c                    |   10 +-
 irplib/irplib_framelist.c               |    4 +-
 irplib/irplib_hist.c                    |    2 +-
 irplib/irplib_ksigma_clip_body.h        |    6 +-
 irplib/irplib_mkmaster.c                |   18 +-
 irplib/irplib_plugin.c                  |   13 +-
 irplib/irplib_polynomial.c              |    2 +-
 irplib/irplib_ppm.c                     |   13 +-
 irplib/irplib_sdp_spectrum.c            | 3080 +++++++++++++++++++++++++++++++
 irplib/irplib_sdp_spectrum.h            |  770 ++++++++
 irplib/irplib_spectrum.c                |   16 +-
 irplib/irplib_stdstar.c                 |    5 +-
 irplib/irplib_strehl.c                  |    4 +-
 irplib/irplib_wavecal.c                 |    7 +-
 irplib/irplib_wcs.c                     |    2 +-
 irplib/irplib_wlxcorr.c                 |   11 +-
 irplib/tests/Makefile.am                |    9 +-
 irplib/tests/Makefile.in                |   22 +-
 irplib/tests/irplib_hist-test.c         |    1 +
 irplib/tests/irplib_sdp_spectrum-test.c | 1797 ++++++++++++++++++
 irplib/tests/irplib_utils-test.c        |    4 +-
 irplib/tests/irplib_wlxcorr-test.c      |    5 +-
 kmos/kmo_priv_sky_tweak.c               |  115 +-
 recipes/kmos_flat.c                     |    3 -
 recipes/kmos_sky_tweak.c                |   25 +-
 recipes/kmos_wave_cal.c                 |   15 +
 reflex/kmo_sci_red.py                   |   12 +-
 reflex/kmos.xml.in                      |   42 +-
 tools/Makefile                          |   34 +-
 37 files changed, 6006 insertions(+), 228 deletions(-)

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