[Debian-astro-commits] [saods9] 01/04: Merge branch 'upstream' into experimental

[Ole Streicher]

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

olebole pushed a commit to branch experimental
in repository saods9.

commit c6fe0f19291bbcfad0e12a40ef991e5b636ec52f
Merge: 938e3d2 99e85ec
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Oct 7 10:31:30 2016 +0200

    Merge branch 'upstream' into experimental

 ds9/doc/release/r7.0.html                       |    5 +
 ds9/library/ds9.tcl                             |    6 +-
 ds9/library/marker.tcl                          |   10 +-
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |    8 +-
 ds9/win/ds9.rc                                  |    2 +-
 make.pkgs                                       |    2 +-
 tests/regions/ds9.linear.wcs.reg                |    2 +-
 tests/regions/ds9.linear.wcsa.reg               |    2 +-
 tests/regions/ds9.linear.wcsc.reg               |    2 +-
 tests/regions/ds9.linear.wcsd.reg               |    2 +-
 tests/regions/ds9.linear.wcsi.reg               |    2 +-
 tests/regions/ds9.linear.wcsp.reg               |    2 +-
 tksao/frame/annulus.C                           |   42 +-
 tksao/frame/base.h                              |    7 +-
 tksao/frame/basepolygon.C                       |   74 +-
 tksao/frame/box.C                               |   42 +-
 tksao/frame/boxannulus.C                        |   44 +-
 tksao/frame/bpanda.C                            |   92 +-
 tksao/frame/circle.C                            |   36 +-
 tksao/frame/compass.C                           |   38 +-
 tksao/frame/composite.C                         |   36 +-
 tksao/frame/context.C                           |    2 +-
 tksao/frame/coord.C                             |   85 +-
 tksao/frame/coord.h                             |    6 +-
 tksao/frame/cpanda.C                            |   94 +-
 tksao/frame/ellipse.C                           |   42 +-
 tksao/frame/ellipseannulus.C                    |   44 +-
 tksao/frame/epanda.C                            |   98 +-
 tksao/frame/frblt.C                             |   83 +-
 tksao/frame/frmarker.C                          |  409 +--
 tksao/frame/line.C                              |   36 +-
 tksao/frame/marker.C                            |    4 +-
 tksao/frame/parser.C                            | 4428 ++++++++++++-----------
 tksao/frame/parser.Y                            |    3 +-
 tksao/frame/point.C                             |   28 +-
 tksao/frame/projection.C                        |   46 +-
 tksao/frame/ruler.C                             |   44 +-
 tksao/frame/text.C                              |   34 +-
 tksao/frame/vect.C                              |   38 +-
 tksao/vector/vector.C                           |   38 +-
 tksao/vector/vector3d.C                         |   68 +-
 41 files changed, 3042 insertions(+), 3044 deletions(-)

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