Merge remote-tracking branch 'upstream/master'

diff --cc Makefile
Simple merge

diff --cc audio.c
Simple merge

diff --cc radio.c
index 16a3f12b852fdbef376beb1c2aee47a57d63e5ec,92f0c74874f424a3b2fc1b05e9ec13feb1d00f7c..8bd18552c64e82bf0978c28379121feeec5bc953
--- 1/radio.c
--- 2/radio.c
+++ b/radio.c
@@@ -457,13 -441,8 +457,13 @@@ fprintf(stderr,"receiver %d: height=%d 
        break;
  #ifdef LIMESDR
      case LIMESDR_PROTOCOL:
-       lime_protocol_init(0,display_width);
+       lime_protocol_init(0,display_width,receiver[0]->sample_rate);
        break;
 +#endif
 +#ifdef RADIOBERRY
 +      case RADIOBERRY_PROTOCOL:
 +              radioberry_protocol_init(0,display_width);
 +              break;
  #endif
    }
  

diff --cc receiver.c
Simple merge

diff --cc rx_menu.c
Simple merge

diff --cc vfo.c
Simple merge