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

commit 047537b876441cf7200521bde617a75208e5929d
Merge: a2420b7 dbb9538
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 2 16:12:04 2015 +0200

    Merge branch 'upstream' into debian

 admin/config.guess                 |  313 +--
 admin/config.sub                   |   56 +-
 calib/gasgano/config/VIMOS.prefs   |    2 +-
 configure                          |   20 +-
 configure.ac                       |    2 +-
 external/libwcs/admin/config.guess |  313 +--
 external/libwcs/admin/config.sub   |   56 +-
 libpil/admin/config.guess          |  313 +--
 libpil/admin/config.sub            |   56 +-
 libpil/kazlib/admin/config.guess   |  313 +--
 libpil/kazlib/admin/config.sub     |   56 +-
 libpil/kazlib/docs.dvi             |  Bin 196916 -> 196916 bytes
 reflex/vimos_ifu.xml               | 4340 ++++++++++++++++++----------------
 reflex/vimos_ifu.xml.in            | 4334 ++++++++++++++++++----------------
 reflex/vimos_mos.xml.in            | 4563 ++++++++++++++++++++----------------
 reflex/vimos_mos_wkf.oca           |   18 +-
 16 files changed, 7730 insertions(+), 7025 deletions(-)

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