[cpl-plugin-uves] 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-uves.

commit 3a94c341c29e62f99357280f6ab96a5c304054cd
Merge: 02137e4 361ede7
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Jun 25 16:49:43 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog                             |   7 ++
 calib/gasgano/config/UVES.prefs       |   2 +-
 configure                             |  20 ++--
 configure.ac                          |   2 +-
 irplib/irplib_plugin.c                |  37 ++++---
 irplib/irplib_strehl.c                |  15 ++-
 irplib/irplib_utils.c                 |  69 ++++++++++--
 irplib/irplib_utils.h                 |   6 ++
 irplib/tests/irplib_plugin-test.c     |  76 +++++++++++++
 irplib/tests/irplib_polynomial-test.c |   2 +-
 irplib/tests/irplib_utils-test.c      | 116 +++++++++++++++++++-
 reflex/uves-dflats.xml                |  34 +++---
 reflex/uves-dflats.xml.in             |  22 ++--
 reflex/uves.xml                       |  40 +++----
 reflex/uves.xml.in                    |  26 ++---
 reflex/uves_obs_scired_interact.py    |  19 ++++
 regtests/tests/Makefile.am            |  10 +-
 regtests/tests/Makefile.in            |  10 +-
 uves/uves_dfs.c                       |  31 ++++++
 uves/uves_dfs.h                       |   2 +
 uves/uves_reduce_scired.c             |  55 +++++++++-
 uves/uves_utils.h                     | 196 ----------------------------------
 22 files changed, 487 insertions(+), 310 deletions(-)

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