|
From: Tom H. <tom...@us...> - 2012-04-02 22:08:54
|
- Log -----------------------------------------------------------------
commit 7d0560ff42259bcaf8527bbefb150f36f97ae733
Merge: 65421bc 9ee8e0f
Author: Tom Hendrikx <to...@wh...>
Date: Mon Apr 2 23:57:25 2012 +0200
Merge branch 'RELENG_3' into RELENG_3_10
(A bit messy changelog because of the earlier unneeded cherrypicks but nothing seems broken)
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 6 ++++--
README | 6 +++---
RELEASE.NOTES | 2 ++
configure.ac | 2 +-
doc/mysql_drv.txt | 2 +-
doc/pgsql_drv.txt | 2 +-
doc/sqlite_drv.txt | 2 +-
man/dspam.1 | 4 ++--
man/dspam_admin.1 | 4 ++--
man/dspam_clean.1 | 4 ++--
man/dspam_crc.1 | 4 ++--
man/dspam_dump.1 | 4 ++--
man/dspam_logrotate.1 | 4 ++--
man/dspam_merge.1 | 4 ++--
man/dspam_stats.1 | 4 ++--
man/dspam_train.1 | 4 ++--
man/libdspam.3 | 4 ++--
src/agent_shared.c | 4 ++--
src/agent_shared.h | 2 +-
src/base64.c | 2 +-
src/base64.h | 2 +-
src/bnr.c | 2 +-
src/bnr.h | 2 +-
src/buffer.c | 2 +-
src/buffer.h | 2 +-
src/client.c | 2 +-
src/client.h | 2 +-
src/config.h | 2 +-
src/config_api.c | 2 +-
src/config_api.h | 2 +-
src/config_shared.c | 2 +-
src/config_shared.h | 2 +-
src/daemon.c | 2 +-
src/daemon.h | 2 +-
src/decode.c | 2 +-
src/decode.h | 2 +-
src/diction.c | 2 +-
src/diction.h | 2 +-
src/dspam.c | 6 +++---
src/dspam.conf.in | 5 +++++
src/dspam.h | 2 +-
src/dspamc.c | 2 +-
src/dspamc.h | 2 +-
src/error.c | 2 +-
src/error.h | 2 +-
src/example.c | 2 +-
src/hash.c | 2 +-
src/hash.h | 2 +-
src/hash_drv.c | 2 +-
src/hash_drv.h | 2 +-
src/heap.c | 2 +-
src/heap.h | 2 +-
src/language.h | 2 +-
src/libdspam.c | 2 +-
src/libdspam.h | 2 +-
src/libdspam_objects.h | 2 +-
src/list.c | 2 +-
src/list.h | 2 +-
src/mysql_drv.c | 2 +-
src/mysql_drv.h | 2 +-
src/nodetree.c | 2 +-
src/nodetree.h | 2 +-
src/pgsql_drv.c | 2 +-
src/pgsql_drv.h | 2 +-
src/pref.c | 2 +-
src/pref.h | 2 +-
src/read_config.c | 2 +-
src/read_config.h | 2 +-
src/sqlite3_drv.c | 2 +-
src/sqlite3_drv.h | 2 +-
src/sqlite_drv.c | 2 +-
src/sqlite_drv.h | 2 +-
src/storage_driver.c | 2 +-
src/storage_driver.h | 2 +-
src/tokenizer.c | 2 +-
src/tokenizer.h | 2 +-
src/tools.hash_drv/cssclean.c | 2 +-
src/tools.hash_drv/csscompress.c | 2 +-
src/tools.hash_drv/cssconvert.c | 2 +-
src/tools.hash_drv/cssstat.c | 2 +-
src/tools.pgsql_drv/dspam_pg2int8.c | 2 +-
src/tools/dspam_2sql.c | 2 +-
src/tools/dspam_admin.c | 2 +-
src/tools/dspam_clean.c | 2 +-
src/tools/dspam_crc.c | 2 +-
src/tools/dspam_dump.c | 2 +-
src/tools/dspam_merge.c | 2 +-
src/tools/dspam_stats.c | 2 +-
src/util.c | 2 +-
src/util.h | 2 +-
webui/cgi-bin/admin.cgi | 2 +-
webui/cgi-bin/admingraph.cgi | 2 +-
webui/cgi-bin/configure.pl.in | 2 +-
webui/cgi-bin/dspam.cgi | 2 +-
webui/cgi-bin/graph.cgi | 2 +-
webui/cgi-bin/htmlize.pl | 2 +-
webui/cgi-bin/templates/cs/strings.pl | 2 +-
webui/cgi-bin/templates/de/strings.pl | 2 +-
webui/cgi-bin/templates/es-es/strings.pl | 2 +-
webui/cgi-bin/templates/fr/strings.pl | 2 +-
webui/cgi-bin/templates/he/strings.pl | 2 +-
webui/cgi-bin/templates/pt-br/strings.pl | 2 +-
webui/cgi-bin/templates/ru/strings.pl | 2 +-
webui/cgi-bin/templates/strings.pl | 2 +-
104 files changed, 127 insertions(+), 118 deletions(-)
hooks/post-receive
--
dspam
|
