[Debian-astro-commits] [saods9] 02/03: Merge branch 'upstream' into experimental
Ole Streicher
olebole at moszumanska.debian.org
Fri Jul 24 11:19:46 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 cb9b333236c3ea871892fcaa12c0e61ef5134c4f
Merge: d6ca279 41b7037
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Jul 24 12:13:14 2015 +0200
Merge branch 'upstream' into experimental
Makefile | 22 +-
Makefile.macosx | 7 +-
Makefile.unix | 4 +-
Makefile.windows | 5 +-
doc/release/r7.0.html | 3 +
ds9/Makefile.macosx | 18 +-
ds9/Makefile.unix | 27 +-
ds9/Makefile.windows | 12 +-
ds9/macosx/SAOImage DS9.app/Contents/Info.plist | 6 +-
make.arm | 22 -
make.cygwin | 19 -
make.cygwin64 | 19 -
make.darwinmavericks | 19 -
make.darwinmountainlion | 19 -
make.darwinyosemite | 19 -
make.linux | 20 -
make.linux64 | 19 -
make.linux64_5 | 20 -
make.macosxmavericks | 13 -
make.macosxmountainlion | 13 -
make.macosxyosemite | 13 -
make.pkgs | 2 +-
make.windows | 20 -
notes.txt | 95 +-
src/Makefile | 2 -
src/ds9.tcl | 2 +-
tksao1.0/Makefile.in | 82 +-
tksao1.0/aclocal.m4 | 2 +
tksao1.0/colorbar/Makefile | 58 -
tksao1.0/colorbar/lex.C | 146 +-
tksao1.0/colorbar/lutlex.C | 56 +-
tksao1.0/colorbar/lutparser.C | 26 +-
tksao1.0/colorbar/lutparser.H | 4 +-
tksao1.0/colorbar/parser.C | 166 +-
tksao1.0/colorbar/parser.H | 4 +-
tksao1.0/colorbar/saolex.C | 66 +-
tksao1.0/colorbar/saoparser.C | 32 +-
tksao1.0/colorbar/saoparser.H | 4 +-
tksao1.0/configure | 122 +-
tksao1.0/configure.in | 14 +-
tksao1.0/fitsy++/Makefile | 93 -
tksao1.0/fitsy++/envilex.C | 164 +-
tksao1.0/fitsy++/enviparser.C | 58 +-
tksao1.0/fitsy++/enviparser.H | 4 +-
tksao1.0/fitsy++/lex.C | 110 +-
tksao1.0/fitsy++/nrrdlex.C | 230 +--
tksao1.0/fitsy++/nrrdparser.C | 80 +-
tksao1.0/fitsy++/nrrdparser.H | 4 +-
tksao1.0/fitsy++/parser.C | 156 +-
tksao1.0/fitsy++/parser.H | 4 +-
tksao1.0/fitsy++/savefits.C | 17 +-
tksao1.0/frame/Makefile | 154 --
tksao1.0/frame/ciaolex.C | 104 +-
tksao1.0/frame/ciaoparser.C | 80 +-
tksao1.0/frame/ciaoparser.H | 4 +-
tksao1.0/frame/ds9lex.C | 326 ++--
tksao1.0/frame/ds9parser.C | 564 +++---
tksao1.0/frame/ds9parser.H | 4 +-
tksao1.0/frame/frsave.C | 10 +-
tksao1.0/frame/lex.C | 724 ++++----
tksao1.0/frame/parser.C | 2238 +++++++++++------------
tksao1.0/frame/parser.H | 4 +-
tksao1.0/frame/proslex.C | 124 +-
tksao1.0/frame/prosparser.C | 140 +-
tksao1.0/frame/prosparser.H | 4 +-
tksao1.0/frame/saolex.C | 74 +-
tksao1.0/frame/saoparser.C | 86 +-
tksao1.0/frame/saoparser.H | 4 +-
tksao1.0/frame/tnglex.C | 134 +-
tksao1.0/frame/tngparser.C | 134 +-
tksao1.0/frame/tngparser.H | 4 +-
tksao1.0/frame/xylex.C | 142 +-
tksao1.0/frame/xyparser.C | 138 +-
tksao1.0/frame/xyparser.H | 4 +-
tksao1.0/list/Makefile | 19 -
tksao1.0/magnifier/Makefile | 30 -
tksao1.0/magnifier/lex.C | 66 +-
tksao1.0/magnifier/parser.C | 34 +-
tksao1.0/magnifier/parser.H | 4 +-
tksao1.0/panner/Makefile | 30 -
tksao1.0/panner/lex.C | 94 +-
tksao1.0/panner/parser.C | 94 +-
tksao1.0/panner/parser.H | 4 +-
tksao1.0/tclconfig/img.m4 | 186 ++
tksao1.0/util/Makefile | 35 -
tksao1.0/vector/Makefile | 18 -
tksao1.0/widget/Makefile | 23 -
87 files changed, 3803 insertions(+), 4176 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-astro-commits
mailing list