[pktools] 278/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 fe15938c2abbc32734d1b05dedf09156125d95e3
Merge: a636f83 48b1600
Author: user <user at osgeolive.(none)>
Date:   Sun Jun 8 15:31:59 2014 +0200

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

 ChangeLog                                   |   13 +
 doc/faq_pkcomposite.dox                     |    4 +-
 doc/mainpage.dox                            |   24 +-
 pktools.pc                                  |    2 +-
 pktools.pc.in                               |    2 +-
 qt/pkcomposite_gui/mainwindow.cc            |    2 +
 qt/pkcrop_gui/mainwindow.cc                 |    4 +-
 qt/pkcrop_gui/mainwindow.ui                 |    2 +-
 qt/pkdiff_gui/main.cpp                      |   30 +
 qt/{pksvm_gui => pkdiff_gui}/mainwindow.cpp |  122 +-
 qt/{pksvm_gui => pkdiff_gui}/mainwindow.h   |   16 +-
 qt/pkdiff_gui/mainwindow.ui                 |  394 +++++
 qt/pkdiff_gui/pkdiff_gui.pro                |   41 +
 qt/pkextract_gui/mainwindow.cpp             |   56 +-
 qt/pkextract_gui/mainwindow.h               |    4 -
 qt/pkextract_gui/mainwindow.ui              |  106 +-
 qt/pksvm_gui/mainwindow.cpp                 |   46 +-
 qt/pksvm_gui/mainwindow.h                   |    2 -
 qt/pksvm_gui/mainwindow.ui                  |    2 +-
 src/algorithms/ConfusionMatrix.h            |    2 +-
 src/algorithms/FeatureSelector.h            |   15 +-
 src/algorithms/Filter2d.cc                  |   13 +-
 src/algorithms/Filter2d.h                   |  375 ++++-
 src/apps/pkann.cc                           |   25 +-
 src/apps/pkcomposite.cc                     |   50 +-
 src/apps/pkcrop.cc                          |    4 +-
 src/apps/pkdiff.cc                          |   88 +-
 src/apps/pkextract.cc                       | 2205 +++++++++++++--------------
 src/apps/pkfillnodata.cc                    |    4 +-
 src/apps/pkfilter.cc                        |    2 +-
 src/apps/pkfilterdem.cc                     |  142 +-
 src/apps/pkfsann.cc                         |  114 +-
 src/apps/pkfssvm.cc                         |  111 +-
 src/apps/pkinfo.cc                          |   48 +-
 src/apps/pklas2img.cc                       |   15 +-
 src/apps/pkoptsvm.cc                        |   18 +-
 src/apps/pksieve.cc                         |    2 +-
 src/apps/pkstatascii.cc                     |   18 +-
 src/apps/pkstatogr.cc                       |  230 +--
 src/apps/pksvm.cc                           |   86 +-
 src/base/Vector2d.h                         |   21 +
 src/imageclasses/ImgReaderGdal.cc           |   10 +-
 src/imageclasses/ImgReaderGdal.h            |    3 +-
 43 files changed, 2740 insertions(+), 1733 deletions(-)

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