diff options
author | Tom Rondeau | 2011-07-26 23:37:15 -0400 |
---|---|---|
committer | Tom Rondeau | 2011-07-26 23:37:15 -0400 |
commit | 302bd2d7125ba1a973433a9ef7cd9afba2d47438 (patch) | |
tree | a3201062994a7d9c7c25947ff149110beb20829a /gr-uhd/include | |
parent | cc8f5c0dc6ca9ae6053343ee8efaf26884aa39cb (diff) | |
parent | 77589906a859cacabd502dbfe93a72889d3fa83c (diff) | |
download | gnuradio-302bd2d7125ba1a973433a9ef7cd9afba2d47438.tar.gz gnuradio-302bd2d7125ba1a973433a9ef7cd9afba2d47438.tar.bz2 gnuradio-302bd2d7125ba1a973433a9ef7cd9afba2d47438.zip |
Merge branch 'master' into next
* master:
doxygen: fixed doxygen warnings.
Fixed type warning.
Fixed warnings about doxygen format.
Fixed return warnings.
Fixed warnings about variable intialization order.
Diffstat (limited to 'gr-uhd/include')
-rw-r--r-- | gr-uhd/include/gr_uhd_usrp_sink.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gr-uhd/include/gr_uhd_usrp_sink.h b/gr-uhd/include/gr_uhd_usrp_sink.h index 320d07d41..2adc5f1bf 100644 --- a/gr-uhd/include/gr_uhd_usrp_sink.h +++ b/gr-uhd/include/gr_uhd_usrp_sink.h @@ -125,7 +125,6 @@ public: /*! * Get the actual dboard gain setting of named stage. - * \param name the name of the gain stage * \param chan the channel index 0 to N-1 * \return the actual gain in dB */ |