CVS commit: src/dist/wpa

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Sat Aug 30 07:34:28 UTC 2008

Modified Files:
        src/dist/wpa/hostapd: config.c hostapd_cli.c
        src/dist/wpa/src/eapol_supp: eapol_supp_sm.c eapol_supp_sm.h
        src/dist/wpa/src/rsn_supp: wpa.c wpa.h wpa_i.h
        src/dist/wpa/wpa_supplicant: events.c preauth_test.c wpa_cli.c
            wpas_glue.c
Removed Files:
        src/dist/wpa/src/eap_common: eap_wsc_common.c eap_wsc_common.h
        src/dist/wpa/src/eap_peer: eap_tlv.c eap_tlv.h eap_wsc.c
        src/dist/wpa/src/eap_server: eap_tlv.c eap_wsc.c
        src/dist/wpa/src/wps: .gitignore Makefile wps.c wps.h
        src/dist/wpa/wpa_supplicant: config_blob.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/dist/wpa/hostapd/config.c \
    src/dist/wpa/hostapd/hostapd_cli.c
cvs rdiff -r1.1.1.1 -r0 src/dist/wpa/src/eap_common/eap_wsc_common.c \
    src/dist/wpa/src/eap_common/eap_wsc_common.h
cvs rdiff -r1.1.1.1 -r0 src/dist/wpa/src/eap_peer/eap_tlv.c \
    src/dist/wpa/src/eap_peer/eap_tlv.h src/dist/wpa/src/eap_peer/eap_wsc.c
cvs rdiff -r1.1.1.1 -r0 src/dist/wpa/src/eap_server/eap_tlv.c \
    src/dist/wpa/src/eap_server/eap_wsc.c
cvs rdiff -r1.2 -r1.3 src/dist/wpa/src/eapol_supp/eapol_supp_sm.c \
    src/dist/wpa/src/eapol_supp/eapol_supp_sm.h
cvs rdiff -r1.3 -r1.4 src/dist/wpa/src/rsn_supp/wpa.c
cvs rdiff -r1.2 -r1.3 src/dist/wpa/src/rsn_supp/wpa.h \
    src/dist/wpa/src/rsn_supp/wpa_i.h
cvs rdiff -r1.1.1.1 -r0 src/dist/wpa/src/wps/.gitignore \
    src/dist/wpa/src/wps/Makefile src/dist/wpa/src/wps/wps.c \
    src/dist/wpa/src/wps/wps.h
cvs rdiff -r1.1.1.1 -r0 src/dist/wpa/wpa_supplicant/config_blob.h
cvs rdiff -r1.2 -r1.3 src/dist/wpa/wpa_supplicant/events.c \
    src/dist/wpa/wpa_supplicant/preauth_test.c \
    src/dist/wpa/wpa_supplicant/wpa_cli.c \
    src/dist/wpa/wpa_supplicant/wpas_glue.c

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