[Debian-astro-commits] [saods9] 02/03: 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 saods9.

commit 5a2898dcb584ad97de48a958ee8361af47cfc5ac
Merge: 0893052 25c4443
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Dec 29 22:27:50 2015 +0100

    Merge branch 'upstream' into debian

 copyright                                       |  2 +-
 ds9/doc/release/r7.0.html                       |  3 +++
 ds9/library/ds9.tcl                             |  2 +-
 ds9/library/saveimage.tcl                       |  5 +++-
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |  6 ++---
 make.include                                    |  2 +-
 make.pkgs                                       |  2 +-
 notes.txt                                       | 36 +++++++++++--------------
 tksao1.0/frame/base.C                           |  2 +-
 9 files changed, 31 insertions(+), 29 deletions(-)

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