diff options
| author | Eric Blossom | 2010-11-17 19:00:12 -0800 |
|---|---|---|
| committer | Eric Blossom | 2010-11-17 19:00:12 -0800 |
| commit | 9edc59fc7cff2321c87042733c0bf29115fb34ee (patch) | |
| tree | d9da7a61eef67c6d9a67cbd3a0d94c850fba76bc /usrp/host | |
| parent | 6129a67cf6527a0f0dc8b83df108c4fe2147155b (diff) | |
| parent | 3f56b10b5eaef36643fd87044601ca47cd9fb707 (diff) | |
| download | gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.tar.gz gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.tar.bz2 gnuradio-9edc59fc7cff2321c87042733c0bf29115fb34ee.zip | |
Merge remote branch 'gnuradio.org/next' into test
* gnuradio.org/next:
distcheck fix for gr-uhd
Keep doxygen 1.7.1 from crashing.
uhd: swig changes for templated ranges
Diffstat (limited to 'usrp/host')
| -rw-r--r-- | usrp/host/include/usrp/usrp_basic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usrp/host/include/usrp/usrp_basic.h b/usrp/host/include/usrp/usrp_basic.h index c24630eb6..b76493ea4 100644 --- a/usrp/host/include/usrp/usrp_basic.h +++ b/usrp/host/include/usrp/usrp_basic.h @@ -88,7 +88,7 @@ protected: */ std::vector< std::vector<db_base_sptr> > d_db; - //! One time call, made only only from usrp_standard_*::make after shared_ptr is created. + // One time call, made only only from usrp_standard_*::make after shared_ptr is created. void init_db(usrp_basic_sptr u); |