Subject: CVS commit: src/dist/wpa_supplicant
To: None <source-changes@NetBSD.org>
From: Rui Paulo <rpaulo@netbsd.org>
List: source-changes
Date: 04/12/2006 15:15:34
Module Name:	src
Committed By:	rpaulo
Date:		Wed Apr 12 15:15:34 UTC 2006

Modified Files:
	src/dist/wpa_supplicant: common.h config.c

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/dist/wpa_supplicant/common.h \
    src/dist/wpa_supplicant/config.c

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