Module Name: src
Committed By: christos
Date: Fri Jan 3 02:08:17 UTC 2014
Modified Files:
src/external/bsd/wpa/dist/hostapd: hostapd_cli.c
src/external/bsd/wpa/dist/src/ap: wpa_auth.c
src/external/bsd/wpa/dist/src/drivers: driver_bsd.c driver_test.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/utils: eloop.c os.h radiotap.h trace.h
src/external/bsd/wpa/dist/wpa_supplicant: wpa_cli.c
Removed Files:
src/external/bsd/wpa/dist/src/crypto: md5-non-fips.c
src/external/bsd/wpa/dist/src/drivers: Apple80211.h MobileApple80211.c
MobileApple80211.h driver_broadcom.c driver_iphone.m driver_osx.m
driver_ralink.c driver_ralink.h wireless_copy.h
src/external/bsd/wpa/dist/src/wps: wps_nfc.c wps_nfc_pn531.c wps_ufd.c
src/external/bsd/wpa/dist/wpa_supplicant: main_symbian.cpp
wpa_supplicant.nsi
src/external/bsd/wpa/dist/wpa_supplicant/symbian: README.symbian
bld.inf wpa_supplicant.mmp
src/external/bsd/wpa/dist/wpa_supplicant/systemd:
wpa_supplicant-nl80...@.service.in wpa_supplicant-wi...@.service.in
wpa_supplic...@.service.in
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui: .gitignore
eventhistory.ui eventhistory.ui.h main.cpp networkconfig.ui
networkconfig.ui.h scanresults.ui scanresults.ui.h
setup-mingw-cross-compiling userdatarequest.ui userdatarequest.ui.h
wpa_gui.pro wpagui.ui wpagui.ui.h wpamsg.h
src/external/bsd/wpa/dist/wpa_supplicant/xcode/wpa_supplicant.xcodeproj:
project.pbxproj
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/hostapd/hostapd_cli.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/src/crypto/md5-non-fips.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/wpa/dist/src/drivers/Apple80211.h \
src/external/bsd/wpa/dist/src/drivers/MobileApple80211.c \
src/external/bsd/wpa/dist/src/drivers/MobileApple80211.h \
src/external/bsd/wpa/dist/src/drivers/driver_broadcom.c \
src/external/bsd/wpa/dist/src/drivers/driver_iphone.m \
src/external/bsd/wpa/dist/src/drivers/driver_osx.m \
src/external/bsd/wpa/dist/src/drivers/driver_ralink.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/wpa/dist/src/drivers/driver_bsd.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/wpa/dist/src/drivers/driver_ralink.c \
src/external/bsd/wpa/dist/src/drivers/wireless_copy.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/src/drivers/driver_test.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
cvs rdiff -u -r1.3 -r1.4 \
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/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/radiotap.h \
src/external/bsd/wpa/dist/src/utils/trace.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/wpa/dist/src/wps/wps_nfc.c \
src/external/bsd/wpa/dist/src/wps/wps_nfc_pn531.c \
src/external/bsd/wpa/dist/src/wps/wps_ufd.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/main_symbian.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.nsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/symbian/README.symbian \
src/external/bsd/wpa/dist/wpa_supplicant/symbian/bld.inf
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/symbian/wpa_supplicant.mmp
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-nl80...@.service.in
\
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-wi...@.service.in
\
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplic...@.service.in
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui.h \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/main.cpp \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui.h \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui.h \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui.h \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpa_gui.pro \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui.h \
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpamsg.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/wpa/dist/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
