[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 b1f09f904c71d8a5c00ee4291fec853e1fb9499a
Merge: 591a63e c36027e
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Oct 21 10:17:14 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.am    |   2 +
 Makefile.in    |   2 +
 ast.news       |  25 +++-
 ast_par.source |   4 +-
 config.h.in    |   3 +
 configure      |  33 +++--
 configure.ac   |   5 +-
 fitschan.c     | 390 +++++++++++++++++++++++++++++++++++++++++++++++----------
 fitschan.h     |  24 +++-
 fmapping.c     |   8 +-
 frameset.c     |  75 +++++++++--
 keymap.c       |   4 +-
 mapping.c      | 146 ++++++++++++---------
 mapping.h      |  16 ++-
 memory.c       | 156 ++++++++++++++++++++++-
 memory.h       |   8 +-
 plot.c         |  35 ++++--
 prism.c        | 207 ++++++++++++++++++++++++++++--
 proj.c         | 241 ++++++++++++++++++++++++++++++++++-
 proj.h         |   4 +
 stcschan.c     |   5 +-
 sun210.tex     | 136 ++++++++++++++++----
 sun211.tex     | 224 ++++++++++++++++++++++++++++++---
 version.h      |   6 +-
 wcsmap.c       |   7 +-
 wcsmap.h       |   9 +-
 26 files changed, 1541 insertions(+), 234 deletions(-)

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