[pktools] 213/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 3e8e2e092531349e7b8aa185ba27018a704c12be
Merge: ff7c493 d2b6d07
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Sat Mar 29 22:06:43 2014 +0100

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

 ChangeLog                                    | 23 +++++++++++++++---
 Makefile.am                                  | 24 +++++++++++++++++++
 configure.ac                                 | 33 +++++++++++++++----------
 doc/examples_pkclassify_svm.dox              | 16 -------------
 doc/examples_pkmosaic.dox                    | 26 --------------------
 doc/{faq_pkmosaic.dox => faq_pkcomposit.dox} |  0
 pktools.pc                                   | 11 +++++++++
 src/algorithms/Makefile.am                   |  7 +++++-
 src/apps/Makefile.am                         | 36 ++++++++++++++--------------
 src/apps/{pkclassify_nn.cc => pkann.cc}      |  0
 src/apps/{pkmosaic.cc => pkcomposit.cc}      |  0
 src/apps/{pkfs_nn.cc => pkfsann.cc}          |  0
 src/apps/{pkfs_svm.cc => pkfssvm.cc}         |  0
 src/apps/{pkopt_svm.cc => pkoptsvm.cc}       |  0
 src/apps/{pkregression_nn.cc => pkregann.cc} |  0
 src/apps/{pkclassify_svm.cc => pksvm.cc}     |  0
 src/base/Makefile.am                         |  9 +++++--
 src/fileclasses/Makefile.am                  |  7 +++++-
 src/imageclasses/Makefile.am                 |  7 +++++-
 src/lasclasses/Makefile.am                   |  7 +++++-
 20 files changed, 125 insertions(+), 81 deletions(-)


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