Now
MAIN commitmail json YAML
src/external/bsd/wpa/dist/hostapd/hostapd_cli.c@1.5
/
diff
/
nxr@1.5
src/external/bsd/wpa/dist/src/ap/wpa_auth.c@1.6 / diff / nxr@1.6
src/external/bsd/wpa/dist/src/crypto/md5-non-fips.c deleted
src/external/bsd/wpa/dist/src/drivers/Apple80211.h deleted
src/external/bsd/wpa/dist/src/drivers/MobileApple80211.c deleted
src/external/bsd/wpa/dist/src/drivers/MobileApple80211.h deleted
src/external/bsd/wpa/dist/src/drivers/driver_broadcom.c deleted
src/external/bsd/wpa/dist/src/drivers/driver_bsd.c@1.7 / diff / nxr@1.7
src/external/bsd/wpa/dist/src/drivers/driver_iphone.m deleted
src/external/bsd/wpa/dist/src/drivers/driver_osx.m deleted
src/external/bsd/wpa/dist/src/drivers/driver_ralink.c deleted
src/external/bsd/wpa/dist/src/drivers/driver_ralink.h deleted
src/external/bsd/wpa/dist/src/drivers/driver_test.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/drivers/wireless_copy.h deleted
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/utils/eloop.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/utils/os.h@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/utils/radiotap.h@1.3 / diff / nxr@1.3
src/external/bsd/wpa/dist/src/utils/trace.h@1.3 / diff / nxr@1.3
src/external/bsd/wpa/dist/src/wps/wps_nfc.c deleted
src/external/bsd/wpa/dist/src/wps/wps_nfc_pn531.c deleted
src/external/bsd/wpa/dist/src/wps/wps_ufd.c deleted
src/external/bsd/wpa/dist/wpa_supplicant/main_symbian.cpp deleted
src/external/bsd/wpa/dist/wpa_supplicant/symbian/README.symbian deleted
src/external/bsd/wpa/dist/wpa_supplicant/symbian/bld.inf deleted
src/external/bsd/wpa/dist/wpa_supplicant/symbian/wpa_supplicant.mmp deleted
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in deleted
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in deleted
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant@.service.in deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/.gitignore deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/main.cpp deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpa_gui.pro deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpamsg.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.nsi deleted
src/external/bsd/wpa/dist/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj deleted
src/external/bsd/wpa/dist/src/ap/wpa_auth.c@1.6 / diff / nxr@1.6
src/external/bsd/wpa/dist/src/crypto/md5-non-fips.c deleted
src/external/bsd/wpa/dist/src/drivers/Apple80211.h deleted
src/external/bsd/wpa/dist/src/drivers/MobileApple80211.c deleted
src/external/bsd/wpa/dist/src/drivers/MobileApple80211.h deleted
src/external/bsd/wpa/dist/src/drivers/driver_broadcom.c deleted
src/external/bsd/wpa/dist/src/drivers/driver_bsd.c@1.7 / diff / nxr@1.7
src/external/bsd/wpa/dist/src/drivers/driver_iphone.m deleted
src/external/bsd/wpa/dist/src/drivers/driver_osx.m deleted
src/external/bsd/wpa/dist/src/drivers/driver_ralink.c deleted
src/external/bsd/wpa/dist/src/drivers/driver_ralink.h deleted
src/external/bsd/wpa/dist/src/drivers/driver_test.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/drivers/wireless_copy.h deleted
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/l2_packet/l2_packet_freebsd.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/utils/eloop.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/utils/os.h@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/src/utils/radiotap.h@1.3 / diff / nxr@1.3
src/external/bsd/wpa/dist/src/utils/trace.h@1.3 / diff / nxr@1.3
src/external/bsd/wpa/dist/src/wps/wps_nfc.c deleted
src/external/bsd/wpa/dist/src/wps/wps_nfc_pn531.c deleted
src/external/bsd/wpa/dist/src/wps/wps_ufd.c deleted
src/external/bsd/wpa/dist/wpa_supplicant/main_symbian.cpp deleted
src/external/bsd/wpa/dist/wpa_supplicant/symbian/README.symbian deleted
src/external/bsd/wpa/dist/wpa_supplicant/symbian/bld.inf deleted
src/external/bsd/wpa/dist/wpa_supplicant/symbian/wpa_supplicant.mmp deleted
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-nl80211@.service.in deleted
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-wired@.service.in deleted
src/external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant@.service.in deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_cli.c@1.4 / diff / nxr@1.4
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/.gitignore deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/main.cpp deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpa_gui.pro deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_gui/wpamsg.h deleted
src/external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.nsi deleted
src/external/bsd/wpa/dist/wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj deleted
merge conflicts