[saods9] 01/02: Merge branch 'upstream' into experimental
Ole Streicher
olebole at moszumanska.debian.org
Sat Jul 4 12:30:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit b6cc3e2ecd057464c02e084c4d29e4486de90e8d
Merge: 61f7be1 f5fe847
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jul 4 13:13:01 2015 +0200
Merge branch 'upstream' into experimental
Makefile | 267 +++++++++-----
Makefile.macosx | 114 +-----
Makefile.unix | 88 +----
Makefile.windows | 104 +-----
doc/ref/command.html | 47 ++-
doc/ref/samp.html | 65 +++-
doc/ref/xpa.html | 65 +++-
doc/release/r7.0.html | 2 +
ds9/Makefile.macosx | 4 +-
ds9/macosx/SAOImage DS9.app/Contents/Info.plist | 6 +-
make.arm | 7 +-
make.cygwin | 6 +-
make.cygwin64 | 7 +-
make.darwinmavericks | 7 -
make.darwinmountainlion | 7 -
make.darwinyosemite | 7 -
make.linux | 7 +-
make.linux64 | 8 +-
make.linux64_5 | 8 +-
make.macosxmavericks | 18 +-
make.macosxmountainlion | 18 +-
make.macosxyosemite | 18 +-
make.pkgs | 3 +-
make.windows | 11 +-
notes.txt | 44 ++-
saotk/Makefile.in | 12 +-
saotk/colorbar/cbgrid.C | 2 +-
saotk/colorbar/cbgrid.h | 2 +-
saotk/colorbar/colorbar.C | 2 +-
saotk/colorbar/colorbar.h | 2 +-
saotk/colorbar/colorbarbase.C | 2 +-
saotk/colorbar/colorbarbase.h | 6 +-
saotk/colorbar/colorbarrgb.C | 2 +-
saotk/colorbar/colorbarrgb.h | 2 +-
saotk/colorbar/colorbartrue.C | 6 +-
saotk/configure | 94 ++++-
saotk/configure.in | 10 +-
saotk/frame/base.C | 11 +-
saotk/frame/base.h | 4 +-
saotk/frame/basebox.C | 2 +-
saotk/frame/basebox.h | 2 +-
saotk/frame/baseellipse.C | 2 +-
saotk/frame/baseellipse.h | 4 +-
saotk/frame/baseline.h | 2 +-
saotk/frame/bpanda.C | 2 +-
saotk/frame/bpanda.h | 2 +-
saotk/frame/compass.C | 2 +-
saotk/frame/compass.h | 2 +-
saotk/frame/composite.C | 2 +-
saotk/frame/composite.h | 4 +-
saotk/frame/contour.C | 4 +-
saotk/frame/contour.h | 2 +-
saotk/frame/cpanda.C | 2 +-
saotk/frame/cpanda.h | 2 +-
saotk/frame/epanda.C | 2 +-
saotk/frame/epanda.h | 2 +-
saotk/frame/frame3dbase.C | 10 +-
saotk/frame/frame3dbase.h | 2 +-
saotk/frame/framergbtruecolor.C | 8 +-
saotk/frame/frametrue.C | 6 +-
saotk/frame/frametruecolor.C | 7 +-
saotk/frame/frmarker.C | 2 +-
saotk/frame/grid.h | 2 +-
saotk/frame/grid25d.h | 2 +-
saotk/frame/grid2d.h | 2 +-
saotk/frame/grid3d.h | 2 +-
saotk/frame/line.C | 2 +-
saotk/frame/line.h | 2 +-
saotk/frame/marker.C | 4 +-
saotk/frame/marker.h | 4 +-
saotk/frame/parser.C | 2 +-
saotk/frame/parser.Y | 2 +-
saotk/frame/point.C | 6 +-
saotk/frame/point.h | 4 +-
saotk/frame/polygon.C | 2 +-
saotk/frame/polygon.h | 2 +-
saotk/frame/projection.C | 2 +-
saotk/frame/projection.h | 2 +-
saotk/frame/ruler.C | 2 +-
saotk/frame/ruler.h | 2 +-
saotk/frame/segment.C | 2 +-
saotk/frame/segment.h | 2 +-
saotk/frame/sigbus.h | 2 +-
saotk/frame/text.C | 2 +-
saotk/frame/text.h | 2 +-
saotk/magnifier/magnifiertrue.C | 8 +-
saotk/panner/pannertrue.C | 7 +-
saotk/util/grf.C | 8 +
saotk/util/grf3d.C | 8 +
saotk/util/grid25dbase.C | 35 +-
saotk/util/grid2dbase.C | 35 +-
saotk/util/grid3dbase.C | 35 +-
saotk/util/gridbase.C | 5 +-
saotk/util/gridbase.h | 2 +-
saotk/util/util.C | 26 +-
saotk/util/util.h | 8 +-
saotk/widget/widget.C | 5 +
src/2mass.tcl | 3 +
src/ds9.tcl | 2 +-
src/eso.tcl | 3 +
src/imgsvr.tcl | 8 +
src/nvss.tcl | 3 +
src/sao.tcl | 3 +
src/skyview.tcl | 456 +++++++++++++++++++++---
src/stsci.tcl | 3 +
src/vla.tcl | 3 +
tclcheckdns1.1/configure | 2 +-
tclcheckdns1.1/configure.in | 2 +-
tcliis1.0/configure | 18 +-
tcliis1.0/configure.in | 4 +-
tests/command.sh | 35 +-
tests/samp/skyview.samp | 2 +
tests/xpa.sh | 48 +--
tests/xpa/minmax.xpa | 6 +-
tkmpeg1.0/Makefile.in | 10 +-
tkmpeg1.0/configure | 341 +-----------------
tkmpeg1.0/configure.in | 4 +-
117 files changed, 1251 insertions(+), 1113 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the debian-science-commits
mailing list