git://developer.intra2net.com / libi2ncommon / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0bd1e98 42cfff4)
Merge remote branch 'origin/amavisd-update' into glibc-upgrade
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 4 Mar 2010 10:47:34 +0000 (11:47 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Thu, 4 Mar 2010 10:47:34 +0000 (11:47 +0100)
Conflicts:
generate/generate/amavisd.ag
packages/amavisd-new/amavisd-new-2.3.3-output-msg-status-for-spamfilter-calibration.patch
packages/amavisd-new/amavisd-new.spec
packages/perl-Net-Server/perl-Net-Server.spec
packages/unarj/unarj.spec
spamfilter_calibrator/src/main.cpp

Removed sqlite 3.6.21 from amavisd-update branch
as glibc-upgrade branch already contains 3.6.22.


Trivial merge
libi2ncommon: Common functions used in Intra2net programs