[cpl-plugin-kmos] 05/06: 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 0b0562e2bd4dd120263382233207acf1d13b041c
Merge: bf4ae5e a02b4c1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 11 15:28:55 2014 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs    |    2 +-
 configure                          |   20 +-
 configure.ac                       |    2 +-
 irplib/irplib_strehl.c             |  113 +-
 irplib/irplib_strehl.h             |    6 -
 kmos/kmo_priv_combine.c            |  865 ++--
 kmos/kmo_priv_shift.c              |  254 +-
 kmos/kmo_priv_sky_tweak.c          |  861 ++--
 kmos/kmo_priv_wave_cal.c           | 7788 +++++++++++++++---------------------
 kmos/kmo_priv_wave_cal.h           |  233 +-
 kmos/tests/kmo_priv_combine-test.c |  118 +-
 recipes/kmo_wave_cal.c             |  245 +-
 tools/HOWTO_reflines.txt           |   42 +
 tools/easySPARK/Makefile           |   42 +-
 tools/wave_cal_ref_lines/main.pro  |   10 +-
 15 files changed, 4385 insertions(+), 6216 deletions(-)

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