[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 b40b75f1f582e081a5d08983546b57b85688ae4e
Merge: dfd8b96 cdebd78
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Nov 18 10:34:16 2015 +0100

    Merge branch 'upstream' into debian

 ds9/doc/release/r7.0.html                       |   3 +
 ds9/library/bin.tcl                             |   1 +
 ds9/library/block.tcl                           |   1 +
 ds9/library/crop.tcl                            |   1 +
 ds9/library/ds9.tcl                             |   2 +-
 ds9/library/info.tcl                            |  79 ++--
 ds9/library/load.tcl                            |   2 +
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |   6 +-
 ds9/win/ds9.rc                                  |   2 +-
 make.pkgs                                       |   2 +-
 notes.txt                                       |  16 +-
 tests/command.sh                                |   2 +-
 tests/lock.sh                                   |   5 -
 tests/samp/cube.samp                            |   4 +-
 tests/samp/saveimage.samp                       |   2 +-
 tests/wcs2.sh                                   |   3 +
 tests/xpa.sh                                    |   2 +-
 tksao1.0/fitsy++/file.h                         |   2 +
 tksao1.0/frame/base.C                           |   2 +-
 tksao1.0/frame/basecommand.C                    |  22 +-
 tksao1.0/frame/context.C                        | 225 +++++-----
 tksao1.0/frame/context.h                        |  14 +-
 tksao1.0/frame/fitsanalysis.C                   |  12 +-
 tksao1.0/frame/fitsbin.C                        |   8 +-
 tksao1.0/frame/fitsblock.C                      |  12 +-
 tksao1.0/frame/fitsdata.C                       |  24 +-
 tksao1.0/frame/fitsdata.h                       |   6 +-
 tksao1.0/frame/fitsimage.C                      | 531 ++++++++++++------------
 tksao1.0/frame/fitsimage.h                      | 180 ++++----
 tksao1.0/frame/frame.C                          |   4 +-
 tksao1.0/frame/framergb.C                       | 294 +++++++++----
 tksao1.0/frame/frload.C                         | 388 ++++++++++-------
 tksao1.0/frame/frmarker.C                       |   2 +-
 tksao1.0/frame/grid3d.C                         |  10 +-
 tksao1.0/widget/widget.C                        |  10 +-
 35 files changed, 1078 insertions(+), 801 deletions(-)

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