diff options
| author | sam <sam@FreeBSD.org> | 2006-03-07 05:51:52 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-03-07 05:51:52 +0000 |
| commit | 7ec4eb033d83d1150a5d461349c32d7113770a57 (patch) | |
| tree | 4c08a6b60d0fad8945a0348eb843f0d8b2bd8d9d /contrib/hostapd/FREEBSD-upgrade | |
| parent | 8410a7ea6cb51f8974a9d5506dacff8d565158f5 (diff) | |
| download | FreeBSD-src-7ec4eb033d83d1150a5d461349c32d7113770a57.zip FreeBSD-src-7ec4eb033d83d1150a5d461349c32d7113770a57.tar.gz | |
resolve merge conflicts
MFC after: 2 weeks
Diffstat (limited to 'contrib/hostapd/FREEBSD-upgrade')
| -rw-r--r-- | contrib/hostapd/FREEBSD-upgrade | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/hostapd/FREEBSD-upgrade b/contrib/hostapd/FREEBSD-upgrade index 5efe2f5..8286ce4 100644 --- a/contrib/hostapd/FREEBSD-upgrade +++ b/contrib/hostapd/FREEBSD-upgrade @@ -6,12 +6,12 @@ WPA/802.1x Authenticator For the import files and directories were pruned by: - tar -X FREEBSD-Xlist -zxf hostapd-0.3.7.tar.gz + tar -X FREEBSD-Xlist -zxf hostapd-0.4.8.tar.gz then imported by: - cvs import -m 'Import of hostapd 0.3.7' \ - src/contrib/hostapd MALINEN v0_3_7 + cvs import -m 'Import of hostapd 0.4.8' \ + src/contrib/hostapd MALINEN v0_4_8 To make local changes to hostapd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor @@ -21,4 +21,4 @@ All local changes should be submitted to Jouni Malinen for inclusion in the next vendor release. sam@FreeBSD.org -4-June-2005 +6-March-2006 |
