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

commit d5d21b61ab0492fe713f31785b83ddace115a6f8
Merge: 10831b7 08630ec
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 31 18:03:28 2014 +0200

    Merge branch 'upstream' into debian

 ChangeLog                               |    6 +
 Makefile.in                             |  316 ++++---
 aclocal.m4                              |  617 +++++++------
 admin/compile                           |   10 +-
 admin/config.guess                      |   43 +-
 admin/config.sub                        |   77 +-
 admin/depcomp                           |  455 ++++++----
 admin/install-sh                        |   14 +-
 admin/missing                           |  414 ++++-----
 admin/test-driver                       |  127 +++
 calib/gasgano/config/XSHOO.prefs        |    2 +-
 calib/gasgano/config/xshoo.tpl.oca      |  358 ++++++++
 configure                               |  513 ++++++-----
 configure.ac                            |    2 +-
 irplib/Makefile.in                      |  321 ++++---
 irplib/irplib_sdp_spectrum.c            |  197 ++++-
 irplib/irplib_sdp_spectrum.h            |   41 +
 irplib/tests/Makefile.in                |  818 +++++++++++++-----
 irplib/tests/irplib_sdp_spectrum-test.c |  168 +++-
 m4macros/libtool.m4                     |   12 +-
 recipes/Makefile.in                     |  308 ++++---
 recipes/xsh_respon_slit_stare.c         |    1 +
 recipes/xsh_scired_ifu_stare.c          |    1 +
 recipes/xsh_scired_slit_stare.c         |    8 +-
 reflex/Makefile.in                      |  107 ++-
 reflex/xsh_object_interactive_common.py |   15 +-
 reflex/xshooter.xml.in                  |  518 +++++------
 regtests/Makefile.in                    |  269 +++---
 regtests/tests/Makefile.in              |  106 ++-
 xsh/Makefile.in                         |  348 ++++----
 xsh/tests/Makefile.in                   | 1427 +++++++++++++++++++++++++------
 xsh/xsh_dfs.c                           |    6 +-
 xsh/xsh_utils.c                         |   20 +-
 33 files changed, 5163 insertions(+), 2482 deletions(-)

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