Date: Mon, 24 Mar 2008 21:08:26 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/hostapd eapol_version.patch ieee802_1x.c wpa.c Message-ID: <200803242108.m2OL8Q1w051429@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
sam 2008-03-24 21:08:25 UTC
FreeBSD src repository
Modified files:
contrib/hostapd ieee802_1x.c wpa.c
Removed files:
contrib/hostapd eapol_version.patch
Log:
resolve merge conflicts
MFC after: 3 weeks
Revision Changes Path
1.2 +0 -129 src/contrib/hostapd/eapol_version.patch (dead)
1.6 +2 -0 src/contrib/hostapd/ieee802_1x.c
1.6 +16 -29 src/contrib/hostapd/wpa.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200803242108.m2OL8Q1w051429>
