[spamassassin/f13/master: 12/12] Merge branch 'f14' into f13

Nick Bebout nb at fedoraproject.org
Mon Oct 25 18:29:42 UTC 2010


commit 5c9a0f080a7f9671d20a06b91cceac170c10c8a8
Merge: 2d191a6 8b502a9
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Mon Oct 25 14:29:27 2010 -0400

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	spamassassin.spec

 .gitignore                |    4 ++--
 sa-update.cronscript      |   43 +++++++++++++++++++++++++++++++++++++------
 sa-update.force-sysconfig |   23 +++++++++++++++++++++--
 sources                   |    4 ++--
 spamassassin.spec         |   15 +++++++++++----
 5 files changed, 73 insertions(+), 16 deletions(-)
---
diff --cc .gitignore
index d411aa9,03446be..5ef469d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,4 +1,2 @@@
--Mail-SpamAssassin-3.3.1.tar.bz2
--Mail-SpamAssassin-rules-3.3.1.r923114.tgz
+ /Mail-SpamAssassin-3.3.2.tar.bz2
+ /Mail-SpamAssassin-rules-3.3.2.r1004932.tgz


More information about the scm-commits mailing list