[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-guest pushed a commit to branch debian
in repository cpl-plugin-fors.

commit ac10eb275cb5aa867297310a9980c0c1297f516b
Merge: 9b3e075 742509b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 21 12:03:47 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.in                                     |   416 +-
 aclocal.m4                                      |   725 +-
 admin/compile                                   |   232 +-
 admin/config.guess                              |   294 +-
 admin/config.sub                                |   263 +-
 admin/depcomp                                   |   531 +-
 admin/install-sh                                |    35 +-
 admin/ltmain.sh                                 |  4017 ++++---
 admin/missing                                   |   461 +-
 admin/test-driver                               |   127 +
 calib/gasgano/config/FORS1.prefs                |     2 +-
 calib/gasgano/config/FORS2.prefs                |     2 +-
 config.h.in                                     |     3 +
 configure                                       | 13881 ++++++++++------------
 configure.ac                                    |     2 +-
 fors/Makefile.in                                |   433 +-
 fors/fors_flat_normalise.cc                     |   107 +-
 fors/fors_flat_normalise.h                      |    55 +-
 fors/fors_response.cc                           |     5 +-
 fors/moses.c                                    |     1 -
 fors/tests/Makefile.in                          |  1043 +-
 irplib/Makefile.in                              |   362 +-
 irplib/tests/Makefile.in                        |   829 +-
 m4macros/libtool.m4                             |  2256 ++--
 m4macros/ltoptions.m4                           |    32 +-
 m4macros/ltversion.m4                           |    12 +-
 m4macros/lt~obsolete.m4                         |    12 +-
 mosca/Makefile.in                               |   293 +-
 mosca/hdrl/Makefile.in                          |   498 +-
 mosca/hdrl/tests/Makefile.in                    |   835 +-
 mosca/libmosca/Makefile.in                      |   392 +-
 mosca/libmosca/flat_combine.tcc                 |    10 +-
 mosca/libmosca/image_normalisation.h            |     6 +-
 mosca/libmosca/image_normalisation.tcc          |    29 +-
 mosca/libmosca/mosca_image.tcc                  |     4 +-
 mosca/libmosca/response.cpp                     |    72 +-
 mosca/libmosca/response.h                       |    14 +-
 mosca/libmosca/tests/Makefile.in                |   703 +-
 mosca/libmosca/vector_utils.tcc                 |     2 +-
 recipes/Makefile.am                             |     2 +-
 recipes/Makefile.in                             |   772 +-
 recipes/fors_calib.cc                           |   146 +-
 recipes/fors_normalise_flat.cc                  |    51 +-
 recipes/fors_science.cc                         |   115 +-
 recipes/fors_spec_mflat.cc                      |    10 +-
 recipes/tests/Makefile.in                       |   689 +-
 reflex/Makefile.am                              |     2 +-
 reflex/Makefile.in                              |   146 +-
 reflex/fors1_spec_wkf_2006-10-24_2009-03-31.oca |   275 +
 reflex/fors2_spec_wkf_pre2006.oca               |   352 +
 reflex/fors_plot_common.py                      |    76 +-
 reflex/fors_response_interact.py                |    35 +-
 reflex/fors_science_interact.py                 |     6 +-
 reflex/fors_spec.xml.in                         |   230 +-
 54 files changed, 18345 insertions(+), 13558 deletions(-)

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