[Debian-astro-commits] [starlink-ast] 01/04: 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 00a93a0b0ab295eeacf4491492587c7bd6c960fe
Merge: 65f6f3a 03eb30b
Author: Ole Streicher <ole at aip.de>
Date:   Wed Mar 23 15:12:32 2016 +0100

    Merge branch 'upstream' into debian

 Makefile.am    |  154 +-
 Makefile.in    | 1498 +++++++++--------
 ast.news       |   20 +-
 cmpframe.c     |    4 +-
 cmpmap.c       |    2 +-
 configure      |   65 +-
 configure.ac   |   25 +-
 dsbspecframe.c |    2 +-
 fitschan.c     |   47 +-
 fluxframe.c    |    2 +-
 frame.c        |    2 +-
 frameset.c     |    4 +-
 frameset.h     |    2 +-
 plot.c         |    4 +-
 region.c       |    2 +-
 skyframe.c     |    2 +-
 specframe.c    |    2 +-
 sun210.tex     | 2954 ++++++++++++++++----------------
 sun211.tex     | 5088 ++++++++++++++++++++++++++++----------------------------
 timeframe.c    |    2 +-
 version.h      |   10 +-
 21 files changed, 5030 insertions(+), 4861 deletions(-)

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