[Debian-astro-commits] [cpl-plugin-fors] 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-fors.

commit 018921df6fdb54e088ea5c513a8c8bd5417ccd28
Merge: 9cf17a1 b9cf164
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 2 15:01:34 2015 +0200

    Merge branch 'upstream' into debian

 calib/cal_size                            |    2 +-
 calib/gasgano/config/FORS1.prefs          |    2 +-
 calib/gasgano/config/FORS2.prefs          |    2 +-
 configure                                 |   33 +-
 configure.ac                              |    3 +-
 fors/fors_dfs.c                           |   18 +-
 fors/fors_flat_normalise.cc               |   36 +
 fors/fors_flat_normalise.h                |    4 +
 fors/fors_response.cc                     |   20 +-
 fors/moses.c                              |  161 +-
 fors/moses.h                              |    3 +-
 mosca/libmosca/flat_combine.tcc           |    2 +-
 mosca/libmosca/response.cpp               |  100 +-
 mosca/libmosca/response.h                 |   29 +-
 mosca/libmosca/wavelength_calibration.cpp |   19 +-
 recipes/fors_calib.cc                     |    5 +-
 recipes/fors_science.cc                   |   16 +-
 reflex/fors_calib_interact.py             |    5 +-
 reflex/fors_imaging.xml                   | 3896 ++++++++++----------
 reflex/fors_imaging.xml.in                | 3890 ++++++++++----------
 reflex/fors_imaging_wkf.oca               |   58 +-
 reflex/fors_plot_common.py                |    3 +-
 reflex/fors_pmos.xml.in                   | 1196 +++---
 reflex/fors_pmos_wkf.oca                  |   29 -
 reflex/fors_response_interact.py          |    2 +-
 reflex/fors_science_interact.py           |    2 +-
 reflex/fors_spec.xml                      | 5616 +++++++++++++++--------------
 reflex/fors_spec.xml.in                   | 5604 ++++++++++++++--------------
 reflex/fors_spec_wkf.oca                  |   44 +-
 29 files changed, 11169 insertions(+), 9631 deletions(-)

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