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

commit 568060e5cf7f3146df92a6d372fdfc2c17e2b292
Merge: ec0e784 741e2e3
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Fri Dec 11 09:55:17 2015 +0100

    Merge branch 'upstream' into debian

 ds9/doc/release/r7.0.html                       |   7 +
 ds9/library/analysis.tcl                        |  10 +-
 ds9/library/backup.tcl                          |  29 +-
 ds9/library/catcdssrch.tcl                      |   2 +-
 ds9/library/cube.tcl                            |   2 +-
 ds9/library/ds9.tcl                             |   5 +-
 ds9/library/hv.tcl                              |  23 +
 ds9/library/manalysis.tcl                       |  15 +-
 ds9/library/medit.tcl                           |  12 +-
 ds9/library/prefs.tcl                           |  20 +-
 ds9/library/samp.tcl                            |   2 +-
 ds9/library/wcs.tcl                             |   3 +-
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |   6 +-
 macosx/Makefile.in                              |   9 +-
 make.include                                    |  33 +-
 make.pkgs                                       |   2 +-
 notes.txt                                       |  43 +-
 tksao1.0/fitsy++/file.C                         |  42 +-
 tksao1.0/fitsy++/file.h                         |  16 +-
 tksao1.0/frame/base.C                           |   2 -
 tksao1.0/frame/base.h                           |   1 -
 tksao1.0/frame/basecommand.C                    |  32 +-
 tksao1.0/frame/context.C                        |  20 +-
 tksao1.0/frame/context.h                        |   4 +
 tksao1.0/frame/fitsimage.C                      | 940 ++++++++++++++----------
 tksao1.0/frame/fitsimage.h                      |  35 +-
 tksao1.0/frame/marker.C                         |   8 +-
 unix/Makefile.in                                |   6 +-
 28 files changed, 770 insertions(+), 559 deletions(-)

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