[pktools] 368/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 4b602f1d9586071840625e42e54df3a3eab97ed3
Merge: 7c06b8d 954843e
Author: Pieter Kempeneers <kempenep at gmail.com>
Date:   Fri Nov 28 22:44:25 2014 +0100

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

 ChangeLog                    |   7 +
 configure.ac                 |   4 +-
 install_pktools.sh           |   2 +-
 pktools.pc                   |   2 +-
 src/algorithms/Filter.cc     |   8 ++
 src/algorithms/Filter.h      |  11 +-
 src/algorithms/StatFactory.h | 336 +++++++++++++++++++++++++++++++------------
 src/apps/pkfilter.cc         |   1 +
 8 files changed, 274 insertions(+), 97 deletions(-)

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