Merge remote-tracking branch 'mossmann/master' int...
by
schneider
9 years 1 week
Merge remote-tracking branch 'mossmann/master' into opera-merge
Conflicts:
firmware/common/hackrf_core.c
firmware/common/rf_path.c
firmware/hackrf-common.cmake
firmware/hackrf_usb/hackrf_usb.c
firmware/hackrf_usb/usb_api_transceiver.c
host/hackrf-tools/src/hackrf_transfer.c