[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 802210b9c5251867c2fb516c2768f8733333eb54
Merge: ee91077 922c8c1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Apr 10 11:18:31 2015 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs   |   2 +-
 configure                         |  20 +-
 configure.ac                      |   2 +-
 kmos/kmo_functions.c              |  95 +++++
 kmos/kmo_functions.h              |   2 +
 kmos/kmo_priv_functions.c         | 202 -----------
 kmos/kmo_priv_functions.h         |   9 -
 kmos/kmo_priv_multi_reconstruct.c | 716 --------------------------------------
 kmos/kmo_priv_multi_reconstruct.h |  16 -
 recipes/kmos_sci_red.c            | 107 +++++-
 tools/Makefile                    |  34 +-
 11 files changed, 226 insertions(+), 979 deletions(-)

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