[saods9] 01/02: Merge branch 'upstream' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository saods9.

commit 21b831ed4f0ffe46a8a3b3f943381eff80d7e988
Merge: af28637 9e375c4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Oct 7 14:42:37 2014 +0200

    Merge branch 'upstream' into debian

 Makefile.macosx                                 |   2 +-
 doc/new.html                                    |  84 ++-
 doc/ref/command.html                            | 175 +++++-
 doc/ref/samp.html                               | 239 ++++++--
 doc/ref/xpa.html                                | 239 ++++++--
 doc/release/r7.0.html                           |  11 +
 ds9/macosx/README                               |   2 +-
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |   6 +-
 htmlwidget/src/htmlwidget.c                     |   9 +-
 make.cygwin64                                   |   2 +-
 make.linux                                      |   4 +-
 make.pkgs                                       |   2 +-
 notes.txt                                       |  13 +-
 saotk/colorbar/lex.C                            | 601 ++++++++++---------
 saotk/colorbar/lex.L                            |   2 +
 saotk/colorbar/parser.C                         | 767 ++++++++++++------------
 saotk/colorbar/parser.H                         | 170 +++---
 saotk/colorbar/parser.Y                         |   3 +
 saotk/frame/base.h                              |   1 -
 saotk/frame/basecommand.C                       |  22 -
 saotk/widget/widget.C                           |  22 +
 saotk/widget/widget.h                           |   1 +
 src/Makefile                                    |   2 +-
 src/backup.tcl                                  |  10 +-
 src/colorbar.tcl                                |  34 +-
 src/comm.tcl                                    |   6 +-
 src/command.tcl                                 |   3 +-
 src/dialog.tcl                                  |  27 +-
 src/ds9.tcl                                     |  13 +-
 src/frame.tcl                                   |  71 ++-
 src/hv.tcl                                      |  49 +-
 src/info.tcl                                    |   1 +
 src/manalysis.tcl                               |   6 +-
 src/medit.tcl                                   |   2 +
 src/mfile.tcl                                   |  15 +-
 src/mregion.tcl                                 |   1 +
 src/prefs.tcl                                   |  34 +-
 src/source.tcl                                  |   2 +-
 src/util.tcl                                    |   4 +-
 src/{first.tcl => vla.tcl}                      |  91 +--
 src/vo.tcl                                      |   2 +-
 src/xpa.tcl                                     |  35 +-
 tests/command.sh                                | 191 +++---
 tests/samp.sh                                   |   2 +-
 tests/samp/{first.samp => vla.samp}             |   2 +
 tests/xpa.sh                                    | 248 ++++----
 tests/xpa/vla.xpa                               |   6 +
 47 files changed, 1980 insertions(+), 1254 deletions(-)

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