[libreswan/f20: 2/2] Merge branch 'f20' of ssh://pkgs.fedoraproject.org/libreswan into f20

Paul Wouters pwouters at fedoraproject.org
Wed Dec 11 19:48:50 UTC 2013


commit 363a7fef496c308b74a042567043a45fe5d94ae5
Merge: 00d2ab7 852aa89
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Dec 11 14:47:47 2013 -0500

    Merge branch 'f20' of ssh://pkgs.fedoraproject.org/libreswan into f20
    
    Conflicts:
    	libreswan.spec

 .gitignore     |    2 ++
 libreswan.spec |   51 ++++++++++++++++++++++++++++++++++++---------------
 sources        |    2 +-
 3 files changed, 39 insertions(+), 16 deletions(-)
---


More information about the scm-commits mailing list