[perl-Crypt-DSA: 5/5] Merge branch 'master' into el6

Paul Howarth pghmcfc at fedoraproject.org
Fri Jun 17 09:28:35 UTC 2011


commit 91648dbc03c63683415a40391a4bd6a27c079df5
Merge: b227f2c 5b42adf
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Jun 17 10:27:12 2011 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	perl-Crypt-DSA.spec

 .gitignore                    |    2 +-
 perl-Crypt-DSA-dsaparam.patch |   73 -----------------------------------------
 perl-Crypt-DSA.spec           |   68 ++++++++++++++++++++++----------------
 sources                       |    2 +-
 4 files changed, 41 insertions(+), 104 deletions(-)
---


More information about the scm-commits mailing list