[pktools] 218/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 6e989998022c5312d07967c3e7cf2438fa80e874
Merge: 2861fdc 009288c
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Mon Mar 31 14:21:21 2014 +0200

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

 ChangeLog                                  |  2 +-
 pktools.pc.in                              | 11 ++++++++++
 src/algorithms/StatFactory.h               |  6 ++++--
 src/apps/Makefile.am                       |  4 ++--
 src/apps/pkann.cc                          | 22 ++++++++++----------
 src/apps/{pkcomposit.cc => pkcomposite.cc} |  0
 src/apps/pkextract.cc                      | 12 +++++++++--
 src/apps/pkfsann.cc                        | 22 ++++++++++----------
 src/apps/pkfssvm.cc                        | 20 ++++++++++---------
 src/apps/pklas2img.cc                      |  9 +++++----
 src/apps/pkoptsvm.cc                       | 20 ++++++++++---------
 src/apps/pksvm.cc                          | 22 ++++++++++----------
 src/imageclasses/ImgReaderOgr.cc           | 32 ++++++++++++++++++++----------
 src/imageclasses/ImgReaderOgr.h            | 24 ++++++++++++----------
 14 files changed, 125 insertions(+), 81 deletions(-)

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