[Debian-astro-commits] [starlink-ast] 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 starlink-ast.

commit d258ddc620ba4b44650fb7540207039a583119a9
Merge: ec8f11c 3c81d7d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Oct 19 09:46:23 2015 +0200

    Merge branch 'upstream' into debian

 ast.news     |     7 +-
 configure    |    20 +-
 configure.ac |     2 +-
 fitschan.c   |    63 +-
 fmapping.c   | 14425 +++------------------------------------------------------
 grismmap.c   |    36 +-
 grismmap.h   |     6 +-
 mapping.c    |    44 +-
 polymap.c    |    21 +-
 sun210.tex   |     7 +-
 sun211.tex   |     7 +-
 version.h    |     6 +-
 12 files changed, 783 insertions(+), 13861 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/starlink-ast.git