[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-guest pushed a commit to tag debian/1.3.2+dfsg-1
in repository cpl-plugin-kmos.

commit cb2a4122895ad9c051ade8cf083644e44131369b
Merge: f1e0d35 2928961
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu May 8 11:57:01 2014 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs       |    2 +-
 configure                             |   20 +-
 configure.ac                          |    2 +-
 irplib/irplib_strehl.c                |   15 +-
 irplib/tests/irplib_polynomial-test.c |    2 +-
 kmos/kmo_dfs.c                        |    2 +-
 kmos/kmo_functions.c                  | 1834 ++++++++++++++-------------------
 kmos/kmo_priv_flat.c                  |   71 +-
 kmos/kmo_priv_lcorr.c                 |   33 +-
 kmos/kmo_priv_wave_cal.c              |  165 ++-
 recipes/kmo_illumination.c            | 1345 ++++++++++--------------
 recipes/kmo_sci_red.c                 |   23 +-
 recipes/kmo_wave_cal.c                |   83 +-
 reflex/kmo_sci_red.py                 |   50 +-
 reflex/kmo_std_star.py                |   20 +
 reflex/kmo_wave_cal.py                |    7 +-
 reflex/kmos.xml.in                    |  280 +++--
 regtests/tests/Makefile.am            |   10 +-
 regtests/tests/Makefile.in            |   10 +-
 tools/easySPARK/Makefile              |   34 +-
 20 files changed, 1771 insertions(+), 2237 deletions(-)

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