Subject: CVS commit: src/dist/wpa_supplicant
To: None <source-changes@NetBSD.org>
From: Rui Paulo <rpaulo@netbsd.org>
List: source-changes
Date: 05/25/2006 04:07:22
Module Name:	src
Committed By:	rpaulo
Date:		Thu May 25 04:07:22 UTC 2006

Modified Files:
	src/dist/wpa_supplicant: common.h config.c eap_tls.c eap_ttls.c
	    preauth.c wpa.c

Log Message:
Resolve conflicts for wpa_supplicant 0.4.9 import.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 src/dist/wpa_supplicant/common.h
cvs rdiff -r1.3 -r1.4 src/dist/wpa_supplicant/config.c \
    src/dist/wpa_supplicant/eap_ttls.c
cvs rdiff -r1.2 -r1.3 src/dist/wpa_supplicant/eap_tls.c \
    src/dist/wpa_supplicant/preauth.c src/dist/wpa_supplicant/wpa.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.