[Debian-astro-commits] [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 1efceffc57345e1b10a418a60120e38d1a6f6d02
Merge: 9b7b114 3dd341a
Author: Ole Streicher <ole at aip.de>
Date:   Wed May 11 14:56:36 2016 -0300

    Merge branch 'upstream' into debian

 calib/gasgano/config/KMOS.prefs |    2 +-
 configure                       |   20 +-
 configure.ac                    |    2 +-
 kmos/kmo_dfs.c                  |    8 +-
 kmos/kmo_dfs.h                  |    4 -
 kmos/tests/kmo_dfs-test.c       |    4 +-
 reflex/kmos.xml.in              | 1610 +++++++++++++++++++++++++++++----------
 reflex/kmos_wkf.oca             |   18 +-
 tools/Makefile                  |   34 +-
 9 files changed, 1245 insertions(+), 457 deletions(-)

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