[pktools] 02/05: Merge tag 'upstream/2.6.1'

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository pktools.

commit bf78eb7a243bf27117013d91e4508ea9fe0b86b8
Merge: f565262 06f80f8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Dec 3 21:16:24 2014 +0100

    Merge tag 'upstream/2.6.1'
    
    Upstream version 2.6.1

 ChangeLog                    |  24 +-
 configure                    |  36 +--
 configure.ac                 |   6 +-
 ltmain.sh                    |   4 +-
 m4/libtool.m4                |  12 +-
 src/algorithms/Filter.cc     |   8 +
 src/algorithms/Filter.h      |  11 +-
 src/algorithms/Filter2d.h    |   2 +-
 src/algorithms/StatFactory.h | 336 ++++++++++++++++++-------
 src/algorithms/myfann_cpp.h  |  18 +-
 src/apps/Makefile.am         |   4 +-
 src/apps/Makefile.in         |  49 ++--
 src/apps/pkann.cc            | 116 +++++----
 src/apps/pkascii2ogr.cc      |   2 -
 src/apps/pkdumpimg.cc        |  23 +-
 src/apps/pkegcs.cc           |   2 +-
 src/apps/pkextract.cc        | 580 +++++++++++++++++++++++--------------------
 src/apps/pkfilter.cc         |   3 +-
 src/apps/pkfilterascii.cc    |   2 +-
 src/apps/pkfilterdem.cc      |   6 +-
 src/apps/pkfsann.cc          |   4 +-
 src/apps/pkfssvm.cc          |   4 +-
 src/apps/pkinfo.cc           |   2 +-
 src/apps/pkkalman.cc         |  15 +-
 src/apps/pklas2img.cc        |   2 +-
 src/apps/pkoptsvm.cc         |   4 +-
 src/apps/pkpolygonize.cc     |   2 +-
 src/apps/pkregann.cc         |   8 +-
 src/apps/pkstatascii.cc      |   2 +-
 src/apps/pksvm.cc            | 128 ++++++----
 src/base/Makefile.am         |   8 +-
 src/base/Makefile.in         | 177 +++++--------
 32 files changed, 902 insertions(+), 698 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git