[pan2: 48/68] Merge branch 'filters' into integration

[Petr Kovář <pmkovar src gnome org>]

commit 595eb83007ce6744b63df0a3951798fbf18a054d
Merge: 6e5a340 e8a2495
Author: K. Haley <haleykd users sf net>
Date:   Fri Aug 6 17:02:23 2010 -0600

    Merge branch 'filters' into integration

 pan/data-impl/article-filter.cc    |   38 ++++++++++++++++++++++++++---------
 pan/data-impl/data-impl.h          |    2 +-
 pan/data/article-cache.cc          |    2 +-
 pan/data/article-cache.h           |    2 +-
 pan/data/data.h                    |    2 +
 pan/gui/header-pane.cc             |    3 ++
 pan/usenet-utils/filter-info.cc    |   10 +++++++++
 pan/usenet-utils/filter-info.h     |    3 ++
 pan/usenet-utils/scorefile-test.cc |   18 ++++++++++++++--
 9 files changed, 64 insertions(+), 16 deletions(-)
---