[cpl-plugin-kmos] 01/03: 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 0090d49f2d6c8ad6d8e589fd4b8437e47a0c24e4
Merge: 3626499 171fca7
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Sep 9 14:40:59 2014 +0200

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs |   2 +-
 configure                       |  20 +++---
 configure.ac                    |   2 +-
 kmos/kmo_priv_flat.c            | 132 ++++++++++++++++++++++------------------
 recipes/kmos_flat.c             |  27 +++++---
 tools/easySPARK/Makefile        |  34 +++++------
 6 files changed, 119 insertions(+), 98 deletions(-)

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