Module Name: src
Committed By: christos
Date: Wed Apr 1 19:45:15 UTC 2015
Modified Files:
src/external/bsd/wpa/bin/hostapd: Makefile
src/external/bsd/wpa/bin/wpa_passphrase: Makefile
src/external/bsd/wpa/bin/wpa_supplicant: Makefile
src/external/bsd/wpa/dist/hostapd: hostapd_cli.c
src/external/bsd/wpa/dist/src/ap: ap_drv_ops.c wpa_auth.c
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c
src/external/bsd/wpa/dist/src/eap_server: eap_server_tls_common.c
src/external/bsd/wpa/dist/src/l2_packet: l2_packet_freebsd.c
src/external/bsd/wpa/dist/src/radius: radius_das.c
src/external/bsd/wpa/dist/src/utils: eloop.c os.h os_unix.c trace.h
src/external/bsd/wpa/dist/wpa_supplicant: ctrl_iface.c events.c
wpa_cli.c wpa_supplicant.c
Removed Files:
src/external/bsd/wpa/dist/src/crypto: crypto_nss.c tls_nss.c
src/external/bsd/wpa/dist/src/drivers: driver_madwifi.c driver_test.c
Log Message:
merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/bin/hostapd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/bin/wpa_passphrase/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/bin/wpa_supplicant/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/wpa/dist/src/crypto/crypto_nss.c
cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/wpa/dist/src/crypto/tls_nss.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
cvs rdiff -u -r1.1.1.4 -r0 \
src/external/bsd/wpa/dist/src/drivers/driver_madwifi.c
cvs rdiff -u -r1.5 -r0 src/external/bsd/wpa/dist/src/drivers/driver_test.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/radius/radius_das.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/src/utils/eloop.c \
src/external/bsd/wpa/dist/src/utils/os.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/utils/os_unix.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/utils/trace.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/wpa/dist/wpa_supplicant/ctrl_iface.c \
src/external/bsd/wpa/dist/wpa_supplicant/events.c \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
