[Debian-astro-commits] [cpl-plugin-xsh] 02/05: 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-xsh.

commit 351ff2915314c45bbb7b2b8d145f4b628a527072
Merge: d828fe4 2a248df
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 23 11:43:14 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                        |   6 +
 calib/gasgano/config/XSHOO.prefs |   2 +-
 configure                        |  20 +-
 configure.ac                     |   2 +-
 irplib/irplib_utils.c            |   1 +
 reflex/xsh_wkf.oca               |  42 ++--
 reflex/xshooter.xml.in           | 491 +++++++++++++++++++++++++++++++++++----
 7 files changed, 481 insertions(+), 83 deletions(-)

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