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

commit 3548aed1068f814cd2f0d23128ca983f504d30e8
Merge: bf7a882 6c5dbc5
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 13:48:01 2016 +0200

    Merge branch 'upstream' into debian

 ChangeLog                        | 57 ++++++++++++++++++++++++
 Makefile.am                      | 12 ++---
 Makefile.in                      | 94 +++++++++++++++++++++++-----------------
 acinclude.m4                     |  6 ++-
 admin/doxygen.am                 | 85 ++++++++++++++++++++++++++++++++++++
 admin/html.am                    | 74 -------------------------------
 amber/Makefile.in                |  1 +
 calib/gasgano/config/AMBER.prefs |  2 +-
 configure                        | 93 ++++++++++++++++++++++++++++++---------
 configure.ac                     |  4 +-
 doxygen/Doxyfile.in              |  6 +--
 recipes/Makefile.in              |  1 +
 recipes/amber_SciCal.c           |  2 +-
 recipes/amber_ascii_export.c     |  2 +-
 recipes/amber_detector.c         |  1 +
 regtests/Makefile.in             |  1 +
 regtests/tests/Makefile.in       |  1 +
 scripts/Makefile.in              |  1 +
 tests/Makefile.in                |  1 +
 19 files changed, 294 insertions(+), 150 deletions(-)

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