[Python-modules-commits] [gamera] 06/14: Merge tag 'upstream/3.4.2'

Daniel Stender danstender-guest at moszumanska.debian.org
Fri May 8 12:42:27 UTC 2015


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

danstender-guest pushed a commit to branch master
in repository gamera.

commit fa9f39481add2917fff39fe1e733aa7fa4529ee6
Merge: 0ef0d7b 78177c0
Author: Daniel Stender <debian at danielstender.com>
Date:   Fri May 8 11:55:36 2015 +0200

    Merge tag 'upstream/3.4.2'
    
    Upstream version 3.4.2

 ACKNOWLEDGEMENTS                                   |    1 +
 CHANGES                                            |   10 +
 PKG-INFO                                           |   12 +
 doc/html/default.css                               |  530 ++++++
 doc/html/html4css1.css                             |  287 ++++
 doc/html/pygments.css                              |   61 +
 doc/makedoctgz                                     |   11 -
 doc/publish_docs.sh                                |   25 -
 doc/src/analysis.txt                               |  528 ++++++
 doc/src/binarization.txt                           |  847 ++++++++++
 doc/src/classes.txt                                |   19 +
 doc/src/classification.txt                         |  236 +++
 doc/src/color.txt                                  |  685 ++++++++
 doc/src/combine.txt                                |  406 +++++
 doc/src/conversion.txt                             |  208 +++
 doc/src/corelation.txt                             |   94 ++
 doc/src/deformations.txt                           |  255 +++
 doc/src/displaying.txt                             |   71 +
 doc/src/draw.txt                                   |  510 ++++++
 doc/src/edge.txt                                   |  214 +++
 doc/src/externallibraries.txt                      |  368 ++++
 doc/src/features.txt                               |  691 ++++++++
 doc/src/file.txt                                   |  163 ++
 doc/src/filter.txt                                 |  863 ++++++++++
 doc/src/gamera.core.ImageData.txt                  |   13 +
 doc/src/gamera.core.ImageInfo.txt                  |   13 +
 doc/src/gamera.core.RGBPixel.txt                   |   13 +
 doc/src/geometry.txt                               |  331 ++++
 doc/src/images/randomwalk_connectivity.fig         |   69 -
 doc/src/install.txt                                |    5 +
 doc/src/list.txt                                   |  175 ++
 doc/src/morphology.txt                             |  315 ++++
 doc/src/pagesegmentation.txt                       |  351 ++++
 doc/src/plugins.txt                                |  968 +++++++++++
 doc/src/relational.txt                             |  144 ++
 doc/src/runlength.txt                              |  317 ++++
 doc/src/segmentation.txt                           |  551 ++++++
 doc/src/thinning.txt                               |  222 +++
 doc/src/transformation.txt                         |  298 ++++
 doc/src/utility.txt                                |  349 ++++
 doc/src/xml.txt                                    |   37 +
 gamera/__compiletime_config__.py                   |    2 +
 gamera/__version__.py                              |    2 +
 gamera/gamera_setup.py                             |    2 +-
 gamera/gendoc.py                                   |    4 +-
 gamera/gui/gamera_display.py                       |    4 +-
 gamera/gui/gui.py                                  |    5 +-
 gamera/gui/gui_util.py                             |    6 +-
 gamera/io.py                                       |    2 +-
 .../mac/ScriptExec/English.lproj/InfoPlist.strings |  Bin 314 -> 0 bytes
 .../ScriptExec/English.lproj/main.nib/classes.nib  |    4 -
 .../mac/ScriptExec/English.lproj/main.nib/info.nib |   19 -
 .../ScriptExec/English.lproj/main.nib/objects.xib  |  271 ---
 gamera/mac/ScriptExec/Info.plist                   |   41 -
 gamera/mac/ScriptExec/License.txt                  |  280 ----
 gamera/mac/ScriptExec/MenuBar.nib.zip              |  Bin 1627 -> 0 bytes
 gamera/mac/ScriptExec/MenuBar.nib/classes.nib      |    4 -
 gamera/mac/ScriptExec/MenuBar.nib/info.nib         |   23 -
 gamera/mac/ScriptExec/MenuBar.nib/objects.xib      |   73 -
 gamera/mac/ScriptExec/README.txt                   |    3 -
 .../ScriptExec/ScriptExec.xcode/project.pbxproj    |  426 -----
 gamera/mac/ScriptExec/ScriptExec_Prefix.pch        |    5 -
 gamera/mac/ScriptExec/main.c                       |  465 -----
 gamera/mac/ScriptExec/openDoc                      |    4 -
 gamera/mac/ScriptExec/script                       |   36 -
 gamera/mac/ScriptExec/version.plist                |   16 -
 .../mac/gameraclick/Gamera.app/Contents/Info.plist |   41 -
 .../gameraclick/Gamera.app/Contents/MacOS/Gamera   |  Bin 46808 -> 0 bytes
 gamera/mac/gameraclick/Gamera.app/Contents/PkgInfo |    1 -
 .../Resources/English.lproj/InfoPlist.strings      |  Bin 314 -> 0 bytes
 .../Contents/Resources/MenuBar.nib/classes.nib     |    4 -
 .../Contents/Resources/MenuBar.nib/info.nib        |   23 -
 .../Contents/Resources/MenuBar.nib/objects.xib     |   73 -
 .../Gamera.app/Contents/Resources/gameraicon.icns  |  Bin 51770 -> 0 bytes
 .../Gamera.app/Contents/Resources/openDoc          |    4 -
 .../Gamera.app/Contents/Resources/script           |   34 -
 gamera/mac/resources/dummy                         |    1 -
 gamera/plugins/png_support.py                      |   11 +-
 gamera_gui                                         |   31 +
 include/knncoremodule.hpp                          |    2 +-
 include/zlib-1.2.1/zconf.h                         |  323 ----
 include/zlib-1.2.1/zlib.h                          | 1200 -------------
 include/{zlib-1.2.1 => zlib-1.2.8}/crc32.h         |    2 +-
 include/{zlib-1.2.1 => zlib-1.2.8}/deflate.h       |   56 +-
 include/zlib-1.2.8/gzguts.h                        |  209 +++
 include/{zlib-1.2.1 => zlib-1.2.8}/inffast.h       |    4 +-
 include/{zlib-1.2.1 => zlib-1.2.8}/inffixed.h      |    6 +-
 include/{zlib-1.2.1 => zlib-1.2.8}/inflate.h       |   37 +-
 include/{zlib-1.2.1 => zlib-1.2.8}/inftrees.h      |   27 +-
 include/{zlib-1.2.1 => zlib-1.2.8}/trees.h         |    4 +-
 include/zlib-1.2.8/zconf.h                         |  511 ++++++
 include/zlib-1.2.8/zlib.h                          | 1768 ++++++++++++++++++++
 include/{zlib-1.2.1 => zlib-1.2.8}/zutil.h         |  139 +-
 mingw32_cross_compile.py                           |  209 ---
 sf-12-2012                                         |    3 -
 src/knncoremodule.cpp                              |   16 +-
 src/libtiff/COPYRIGHT                              |   21 -
 src/zlib-1.2.1/adler32.c                           |   74 -
 src/zlib-1.2.1/gzio.c                              | 1005 -----------
 src/zlib-1.2.8/adler32.c                           |  179 ++
 src/{zlib-1.2.1 => zlib-1.2.8}/compress.c          |    9 +-
 src/{zlib-1.2.1 => zlib-1.2.8}/crc32.c             |  260 ++-
 src/{zlib-1.2.1 => zlib-1.2.8}/deflate.c           |  727 ++++++--
 src/zlib-1.2.8/gzclose.c                           |   25 +
 src/zlib-1.2.8/gzlib.c                             |  634 +++++++
 src/zlib-1.2.8/gzread.c                            |  594 +++++++
 src/zlib-1.2.8/gzwrite.c                           |  577 +++++++
 src/{zlib-1.2.1 => zlib-1.2.8}/infback.c           |  117 +-
 src/{zlib-1.2.1 => zlib-1.2.8}/inffast.c           |   99 +-
 src/{zlib-1.2.1 => zlib-1.2.8}/inflate.c           |  498 ++++--
 src/{zlib-1.2.1 => zlib-1.2.8}/inftrees.c          |   99 +-
 src/{zlib-1.2.1 => zlib-1.2.8}/trees.c             |  157 +-
 src/{zlib-1.2.1 => zlib-1.2.8}/uncompr.c           |    8 +-
 src/{zlib-1.2.1 => zlib-1.2.8}/zutil.c             |   75 +-
 version                                            |    2 +-
 115 files changed, 17337 insertions(+), 5525 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gamera.git



More information about the Python-modules-commits mailing list