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

commit b03709de2e1126fa3948a70d029ebb2647e9f216
Merge: 4f7186f 531aebd
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Sep 2 15:59:16 2015 +0200

    Merge branch 'upstream' into debian

 ChangeLog                                  |    8 +
 calib/gasgano/config/SINFO.prefs           |    2 +-
 configure                                  |   20 +-
 configure.ac                               |    2 +-
 irplib/irplib_utils.c                      |    4 +-
 recipes/sinfo_rec_distortion.c             |    3 +-
 reflex/sinfo.xml.in                        | 3887 ++++++++++++++++------------
 sinfoni/sinfo_dfs.c                        |   52 -
 sinfoni/sinfo_fit.c                        |    6 +-
 sinfoni/sinfo_functions.h                  |    6 +-
 sinfoni/sinfo_key_names.h                  |   72 +-
 sinfoni/sinfo_new_prepare_stacked_frames.c | 1194 +++++----
 sinfoni/sinfo_new_stdstar.c                |  228 +-
 sinfoni/sinfo_pfits.c                      |  228 --
 sinfoni/sinfo_pfits.h                      |   17 -
 sinfoni/sinfo_pro_save.c                   |  297 ---
 sinfoni/sinfo_wavecal.c                    | 1420 ++--------
 17 files changed, 3298 insertions(+), 4148 deletions(-)

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