[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-guest pushed a commit to branch debian
in repository cpl-plugin-kmos.

commit 4ae5b6a110764c9722f41ad03b5af8bd9e29db54
Merge: 85387ac 3c9b5b6
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jun 17 09:08:34 2014 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs   |    2 +-
 configure                         |   20 +-
 configure.ac                      |    2 +-
 irplib/irplib_plugin.c            |   37 +-
 irplib/irplib_utils.c             |   69 +-
 irplib/irplib_utils.h             |    6 +
 irplib/tests/irplib_plugin-test.c |   76 +
 irplib/tests/irplib_utils-test.c  |  116 +-
 kmclipm/src/kmclipm_functions.c   |    2 +-
 kmos/Makefile.am                  |    2 +
 kmos/Makefile.in                  |    7 +-
 kmos/kmo_dfs.c                    |    6 +-
 kmos/kmo_priv_combine.c           |  453 +++
 kmos/kmo_priv_combine.h           |   23 +-
 kmos/kmo_priv_flat.c              | 5533 ++++++++++++++++++-------------------
 kmos/kmo_priv_flat.h              |   37 +-
 kmos/kmo_utils.c                  |  170 +-
 kmos/kmo_utils.h                  |    7 +-
 kmos/kmos_pfits.c                 |  143 +
 kmos/kmos_pfits.h                 |   44 +
 kmos/tests/kmo_priv_flat-test.c   |   67 +-
 recipes/Makefile.am               |   16 +-
 recipes/Makefile.in               |   34 +-
 recipes/kmo_wave_cal.c            |    8 +-
 recipes/kmos_flat.c               | 1229 ++++++++
 recipes/kmos_wave_cal.c           |  883 ++++++
 tools/easySPARK/Makefile          |   34 +-
 27 files changed, 5991 insertions(+), 3035 deletions(-)

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