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

Ole Streicher olebole-guest at alioth.debian.org
Sat Oct 26 16:18:48 UTC 2013


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

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

commit eed28d1cb4582f72b467741b41b8709a2737e085
Merge: 711f7b4 8f0fffb
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Oct 26 18:02:36 2013 +0200

    Merge branch 'upstream' into debian

 Makefile                                           |    4 +
 doc/ref/command.html                               |  109 +-
 doc/ref/samp.html                                  |   98 +-
 doc/ref/xpa.html                                   |   93 +-
 doc/release/r7.0.html                              |   11 +
 make.arm                                           |   27 +
 ...n64x86mountainlion => make.darwin64x86mavericks |   12 +-
 make.darwin64x86mountainlion                       |    4 +-
 make.darwinmavericks                               |    8 +
 ...win64x86mountainlion => make.darwinx86mavericks |   18 +-
 make.pkgs                                          |    2 +-
 msgs/cs.msg                                        |   14 +-
 msgs/da.msg                                        |   14 +-
 msgs/de.msg                                        |   14 +-
 msgs/es.msg                                        |   14 +-
 msgs/fr.msg                                        |   14 +-
 msgs/ja.msg                                        |   14 +-
 msgs/pt.msg                                        |   14 +-
 msgs/zh.msg                                        |   14 +-
 notes.txt                                          |  110 +-
 saotk/frame/Makefile                               |    1 +
 saotk/frame/base.C                                 |   14 +-
 saotk/frame/base.h                                 |   15 +-
 saotk/frame/basecommand.C                          |   67 +-
 saotk/frame/baseline.C                             |    3 +-
 saotk/frame/context.C                              |   71 +-
 saotk/frame/context.h                              |    2 +-
 saotk/frame/ds9lex.C                               | 2677 ++---
 saotk/frame/ds9lex.L                               |   22 +
 saotk/frame/ds9parser.C                            | 3406 +++---
 saotk/frame/ds9parser.H                            |  492 +-
 saotk/frame/ds9parser.Y                            |   10 +-
 saotk/frame/fitsimage.C                            |   23 +
 saotk/frame/fitsimage.h                            |    6 +-
 saotk/frame/fitsmap.C                              |    4 +-
 saotk/frame/fr3dcommand.C                          |   43 +-
 saotk/frame/frame.C                                |    3 +-
 saotk/frame/frame3d.C                              |  923 +-
 saotk/frame/frame3d.h                              |   44 +-
 saotk/frame/frame3dbase.C                          |   45 +-
 saotk/frame/frame3dbase.h                          |   21 +-
 saotk/frame/frame3dtruecolor.C                     |    5 +-
 saotk/frame/framebase.h                            |    1 +
 saotk/frame/framergb.C                             |    3 +-
 saotk/frame/framergbtruecolor.C                    |    5 +-
 saotk/frame/frametruecolor.C                       |   21 +-
 saotk/frame/frblt.C                                |    2 +-
 saotk/frame/frcommand.C                            |    5 +
 saotk/frame/frmarker.C                             |    7 +
 saotk/frame/frscale.C                              |    3 -
 saotk/frame/frscale.h                              |    3 -
 saotk/frame/fvcontour.C                            |    2 +-
 saotk/frame/lex.C                                  | 2837 ++---
 saotk/frame/lex.L                                  |    4 +
 saotk/frame/marker.C                               |    2 +-
 saotk/frame/parser.C                               |10932 ++++++++++----------
 saotk/frame/parser.H                               | 1238 +--
 saotk/frame/parser.Y                               |   39 +-
 saotk/frame/polygon.C                              |    3 +-
 saotk/frame/projection.C                           |    2 +-
 saotk/frame/raytrace.C                             |   36 +
 saotk/frame/raytrace.h                             |   36 +
 saotk/frame/ruler.C                                |    3 +-
 saotk/frame/segment.C                              |    3 +-
 saotk/list/list.C                                  |   25 +
 saotk/list/list.h                                  |    1 +
 saotk/vector/vector.h                              |    2 +
 saotk/vector/vector3d.h                            |    2 +
 src/3d.tcl                                         |  106 +-
 src/analysis.tcl                                   |   31 +-
 src/colorbar.tcl                                   |   36 +-
 src/contour.tcl                                    |   13 +-
 src/cube.tcl                                       |   90 +-
 src/ds9.tcl                                        |    2 +-
 src/frame.tcl                                      |   31 +-
 src/load.tcl                                       |   10 +-
 src/magnifier.tcl                                  |   16 +-
 src/marker.tcl                                     |   18 +
 src/mfile.tcl                                      |    4 -
 src/mframe.tcl                                     |   98 +-
 src/mregion.tcl                                    |   32 +-
 src/mscale.tcl                                     |    1 -
 src/panzoom.tcl                                    |    4 +-
 src/prefs.tcl                                      |    8 +
 src/print.tcl                                      |   16 +-
 src/scale.tcl                                      |   16 -
 src/xpa.tcl                                        |    5 +-
 tests/command.sh                                   |   15 +-
 tests/parse.sh                                     |    2 +-
 tests/prefs/ds9.7.2.prf                            |  115 +
 tests/regions.sh                                   |    4 +
 tests/samp/3d.samp                                 |    2 +
 tests/samp/cube.samp                               |    6 +-
 tests/samp/lock.samp                               |    4 +-
 tests/samp/match.samp                              |    2 +-
 tests/samp/preserve.samp                           |    2 -
 tests/samp/regions.samp                            |    2 +
 tests/xpa.sh                                       |   19 +-
 tests/xpa/3d.xpa                                   |    7 +-
 tests/xpa/cube.xpa                                 |    2 +-
 tests/xpa/lock.xpa                                 |    2 +-
 tests/xpa/preserve.xpa                             |    1 -
 tests/xpa/regions.xpa                              |    1 +
 tlt3.0/bltBase64.c                                 |    5 +
 tlt3.0/bltBase64.h                                 |    6 +
 tlt3.0/bltBgStyle.c                                |    6 +
 tlt3.0/bltBgStyle.h                                |    6 +
 tlt3.0/bltBind.c                                   |    5 +
 tlt3.0/bltBind.h                                   |    6 +
 tlt3.0/bltBitmap.c                                 |    5 +
 tlt3.0/bltBitmap.h                                 |    6 +
 tlt3.0/bltChain.c                                  |    5 +
 tlt3.0/bltChain.h                                  |    5 +
 tlt3.0/bltConfig.c                                 |    5 +
 tlt3.0/bltConfig.h                                 |    6 +
 tlt3.0/bltDBuffer.c                                |    5 +
 tlt3.0/bltDBuffer.h                                |    5 +
 tlt3.0/bltFont.h                                   |    5 +
 tlt3.0/bltGrAxis.c                                 |    5 +
 tlt3.0/bltGrAxis.h                                 |    5 +
 tlt3.0/bltGrBar.c                                  |    5 +
 tlt3.0/bltGrElem.c                                 |    5 +
 tlt3.0/bltGrElem.h                                 |    5 +
 tlt3.0/bltGrHairs.c                                |    5 +
 tlt3.0/bltGrLegd.c                                 |    5 +
 tlt3.0/bltGrLegd.h                                 |    6 +
 tlt3.0/bltGrLine.c                                 |    5 +
 tlt3.0/bltGrMarker.c                               |    6 +
 tlt3.0/bltGrMisc.c                                 |    6 +-
 tlt3.0/bltGrPen.c                                  |    5 +
 tlt3.0/bltGrPs.c                                   |    5 +
 tlt3.0/bltGraph.c                                  |    5 +
 tlt3.0/bltGraph.h                                  |    5 +
 tlt3.0/bltHash.c                                   |    5 +
 tlt3.0/bltHash.h                                   |    5 +
 tlt3.0/bltImage.c                                  |    5 +
 tlt3.0/bltImage.h                                  |    5 +
 tlt3.0/bltInit.c                                   |    5 +
 tlt3.0/bltInt.c                                    |    6 +
 tlt3.0/bltList.c                                   |    5 +
 tlt3.0/bltList.h                                   |    5 +
 tlt3.0/bltMath.h                                   |    5 +
 tlt3.0/bltNsUtil.c                                 |    6 +
 tlt3.0/bltNsUtil.h                                 |    6 +
 tlt3.0/bltOp.h                                     |    5 +
 tlt3.0/bltParse.c                                  |    6 +
 tlt3.0/bltParse.h                                  |    5 +
 tlt3.0/bltPool.c                                   |    6 +
 tlt3.0/bltPool.h                                   |   30 +
 tlt3.0/bltPs.c                                     |    6 +
 tlt3.0/bltPs.h                                     |    5 +
 tlt3.0/bltPsAfm.c                                  |    6 +
 tlt3.0/bltPsInt.h                                  |    5 +
 tlt3.0/bltSpline.c                                 |    6 +
 tlt3.0/bltSpline.h                                 |    6 +
 tlt3.0/bltSwitch.c                                 |    6 +
 tlt3.0/bltSwitch.h                                 |    5 +
 tlt3.0/bltText.c                                   |    6 +
 tlt3.0/bltText.h                                   |    6 +
 tlt3.0/bltUnixFont.c                               |    6 +
 tlt3.0/bltUnixWindow.c                             |    5 +
 tlt3.0/bltUtil.c                                   |    5 +
 tlt3.0/bltVecCmd.c                                 |    6 +
 tlt3.0/bltVecInt.h                                 |    6 +
 tlt3.0/bltVecMath.c                                |    5 +
 tlt3.0/bltVector.c                                 |    6 +
 tlt3.0/bltVector.h                                 |    5 +
 tlt3.0/bltWindow.c                                 |    6 +
 tlt3.0/bltWindow.h                                 |    6 +
 169 files changed, 13241 insertions(+), 11586 deletions(-)

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



More information about the debian-science-commits mailing list