diff options
| author | Tom Rondeau | 2011-07-26 23:36:53 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-07-26 23:36:53 -0400 |
| commit | 77589906a859cacabd502dbfe93a72889d3fa83c (patch) | |
| tree | d76560d881b87885d2078f2d204427269995abb4 /gr-uhd | |
| parent | 8cb0981894000e8239ee2425b4e99ded9841604a (diff) | |
| parent | 8e1f9ce7dde6ba00cdaf6df8f08a602e4a3843b5 (diff) | |
| download | gnuradio-77589906a859cacabd502dbfe93a72889d3fa83c.tar.gz gnuradio-77589906a859cacabd502dbfe93a72889d3fa83c.tar.bz2 gnuradio-77589906a859cacabd502dbfe93a72889d3fa83c.zip | |
Merge branch 'maint'
* maint:
doxygen: fixed doxygen warnings.
Fixed type warning.
Fixed warnings about doxygen format.
Fixed return warnings.
Fixed warnings about variable intialization order.
Conflicts:
volk/include/volk/volk_complex.h
Diffstat (limited to 'gr-uhd')
| -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 */ |