[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 735a6294890415f23e940b3191134745ca709d0f
Merge: 21f94d1 5d32378
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Oct 8 17:14:01 2014 +0200

    Merge branch 'upstream' into debian

 doc/release/r7.0.html                           |  2 +
 ds9/macosx/SAOImage DS9.app/Contents/Info.plist |  6 +--
 make.pkgs                                       |  2 +-
 saotk/frame/compass.C                           | 64 +++++++++++++------------
 saotk/frame/marker.C                            |  8 +++-
 src/ds9.tcl                                     |  2 +-
 6 files changed, 46 insertions(+), 38 deletions(-)

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