[pktools] 131/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 ac1721f832b741f0b9249c55a183ef9f2a772559
Merge: bc8d00e 13d3ec4
Author: user <user at osgeolive.(none)>
Date:   Fri Sep 13 10:20:46 2013 +0200

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

 ChangeLog                          |  6 ++++
 doc/examples_pksetmask.dox         |  3 +-
 doc/faq_pksetmask.dox              |  8 ++++++
 src/apps/pkstat.cc                 | 13 +++++++--
 src/apps/pkstatogr.cc              | 56 +++++++++++++++++++++++++++-----------
 src/fileclasses/FileReaderAscii.cc |  2 +-
 src/fileclasses/FileReaderAscii.h  | 12 ++++----
 7 files changed, 73 insertions(+), 27 deletions(-)

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