[pktools] 243/375: Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools
Bas Couwenberg
sebastic at xs4all.nl
Wed Dec 3 21:54:18 UTC 2014
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 82154ae8a66966b781984e634b0911f219c93380
Merge: 94c4eef f914d1f
Author: Pieter Kempeneers <kempenep at gmail.com>
Date: Thu Apr 17 19:42:57 2014 +0200
Merge branch 'master' of git.sv.gnu.org:/srv/git/pktools
ChangeLog | 1 +
Doxyfile | 2 +-
configure.ac | 2 +-
doc/examples_pkcomposite.dox | 12 +--
doc/faq_pkcomposite.dox | 8 +-
qt/pkcomposite_gui/mainwindow.cc | 20 +++-
qt/pkcomposite_gui/mainwindow.h | 4 +
qt/pkcomposite_gui/mainwindow.ui | 124 +++++++++++++++++-------
qt/pkcrop_gui/mainwindow.cc | 39 +++++++-
qt/pkcrop_gui/mainwindow.h | 5 +
qt/pkcrop_gui/mainwindow.ui | 76 ++++++++++++++-
qt/pkextract_gui/mainwindow.cpp | 30 +++---
qt/pkextract_gui/mainwindow.ui | 48 ++++++++--
qt/pkextract_gui/pkextract_gui.pro | 2 +-
qt/pksvm_gui/mainwindow.cpp | 46 ++++++++-
qt/pksvm_gui/mainwindow.h | 4 +
qt/pksvm_gui/mainwindow.ui | 188 ++++++++++++++++++++++++++++++-------
src/apps/pkann.cc | 10 +-
src/apps/pkascii2img.cc | 2 +-
src/apps/pkascii2ogr.cc | 2 +-
src/apps/pkcomposite.cc | 4 +-
src/apps/pkcreatect.cc | 2 +-
src/apps/pkcrop.cc | 2 +-
src/apps/pkdiff.cc | 2 +-
src/apps/pkdsm2shadow.cc | 2 +-
src/apps/pkdumpimg.cc | 2 +-
src/apps/pkdumpogr.cc | 2 +-
src/apps/pkdumpogr.h | 2 +-
src/apps/pkeditogr.cc | 2 +-
src/apps/pkegcs.cc | 2 +-
src/apps/pkenhance.cc | 2 +-
src/apps/pkextract.cc | 4 +-
src/apps/pkfillnodata.cc | 2 +-
src/apps/pkfilter.cc | 2 +-
src/apps/pkfilterascii.cc | 2 +-
src/apps/pkfsann.cc | 4 +-
src/apps/pkfssvm.cc | 4 +-
src/apps/pkgetmask.cc | 2 +-
src/apps/pkinfo.cc | 2 +-
src/apps/pklas2img.cc | 2 +-
src/apps/pkndvi.cc | 2 +-
src/apps/pkoptsvm.cc | 4 +-
src/apps/pkpolygonize.cc | 2 +-
src/apps/pkreclass.cc | 2 +-
src/apps/pkregann.cc | 4 +-
src/apps/pksensormodel.h | 2 +-
src/apps/pksetmask.cc | 2 +-
src/apps/pksieve.cc | 2 +-
src/apps/pkstatascii.cc | 4 +-
src/apps/pksvm.cc | 20 ++--
50 files changed, 558 insertions(+), 159 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pktools.git
More information about the Pkg-grass-devel
mailing list