[Debian-astro-commits] [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 pushed a commit to branch debian
in repository cpl-plugin-xsh.

commit 0bb07e623a48220084eae73d113404e48be39b7f
Merge: cfb6c30 4936366
Author: Ole Streicher <ole at aip.de>
Date:   Wed Apr 20 12:21:33 2016 +0200

    Merge branch 'upstream' into debian

 ChangeLog                        |   13 +
 calib/gasgano/config/XSHOO.prefs |    2 +-
 calib/gasgano/config/XSHOO.rul   |  Bin 49754 -> 0 bytes
 calib/gasgano/config/xsh_wkf.oca | 3539 --------------------------------------
 calib/gasgano/config/xshoo.oca   |  172 +-
 configure                        |   86 +-
 configure.ac                     |    4 +-
 irplib/irplib_slitpos.c          |    3 +
 recipes/xsh_util_ifu_offset.c    |   21 +-
 recipes/xsh_util_ifu_stare.c     |    1 +
 reflex/xsh_wkf.oca               |   35 +-
 xsh/tests/test-xsh_bspline.c     |   17 +-
 xsh/xsh_badpixelmap.c            |    5 +-
 xsh/xsh_data_rec.c               |    2 +-
 xsh/xsh_data_spectrum.c          |   58 +-
 xsh/xsh_detmon.c                 |    2 +-
 xsh/xsh_detmon_lg.c              |  116 +-
 xsh/xsh_follow_arclines.c        |    2 +-
 xsh/xsh_subtract_sky_single.c    |   18 +-
 xsh/xsh_utils.c                  |   14 +
 xsh/xsh_utils_ifu.c              |  207 ++-
 xsh/xsh_utils_image.c            |   95 +
 xsh/xsh_utils_image.h            |    9 +-
 xsh/xsh_utils_scired_slit.c      |    3 -
 24 files changed, 585 insertions(+), 3839 deletions(-)

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