[pktools] 221/375: Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools

[Bas Couwenberg]

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

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

commit cc0305ead6766f6a84dba4abfc3f8817b20de96c
Merge: 62ab576 97a33c8
Author: Pieter Kempeneers <pieter.kempeneers at vito.be>
Date:   Tue Apr 1 10:18:08 2014 +0200

    Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools

 ChangeLog                                     |  2 +-
 doc/examples_pkcomposite.dox                  | 26 +++++++++++++++
 doc/examples_pksvm.dox                        | 16 +++++++++
 doc/{faq_pkmosaic.dox => faq_pkcomposite.dox} |  0
 pktools.pc                                    | 11 +++++++
 pktools.pc.in                                 | 11 +++++++
 src/algorithms/StatFactory.h                  |  6 ++--
 src/apps/Makefile.am                          |  4 +--
 src/apps/pkann.cc                             | 44 +++++++++++++------------
 src/apps/{pkcomposit.cc => pkcomposite.cc}    |  0
 src/apps/pkextract.cc                         | 47 ++++++++++++++++-----------
 src/apps/pkfsann.cc                           | 22 +++++++------
 src/apps/pkfssvm.cc                           | 20 +++++++-----
 src/apps/pklas2img.cc                         |  9 ++---
 src/apps/pkoptsvm.cc                          | 20 +++++++-----
 src/apps/pksvm.cc                             | 44 +++++++++++++------------
 src/base/Makefile.am                          |  2 +-
 src/imageclasses/ImgReaderOgr.cc              | 32 +++++++++++-------
 src/imageclasses/ImgReaderOgr.h               | 24 +++++++-------
 src/imageclasses/ImgWriterOgr.cc              | 19 +++++------
 src/imageclasses/ImgWriterOgr.h               |  2 +-
 21 files changed, 231 insertions(+), 130 deletions(-)

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