[Midnightbsd-cvs] src: mDNS.c: resolve merge conflict

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Oct 26 07:48:21 EDT 2011

Previous message (by thread): [Midnightbsd-cvs] src: sys/boot: set ssp flags to nothing
Next message (by thread): [Midnightbsd-cvs] src: contrib/bind96: Resolve merge conflicts.
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Log Message:
-----------
resolve merge conflict

Modified Files:
--------------
    src/contrib/mDNSResponder/mDNSCore:
        mDNS.c (r1.2 -> r1.3)
        (http://cvsweb.midnightbsd.org/src/contrib/mDNSResponder/mDNSCore/mDNS.c?r1=1.2&r2=1.3)

Previous message (by thread): [Midnightbsd-cvs] src: sys/boot: set ssp flags to nothing
Next message (by thread): [Midnightbsd-cvs] src: contrib/bind96: Resolve merge conflicts.
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Midnightbsd-cvs mailing list