diff options
author | Eric Blossom <eb@comsec.com> | 2010-11-17 19:00:12 -0800 |
---|---|---|
committer | Eric Blossom <eb@comsec.com> | 2010-11-17 19:00:12 -0800 |
commit | 5c9d25a206d894784d000f8f8a876d8ed3153d24 (patch) | |
tree | d4ac57e40a6e18bbf7698b17ad913a822a5bf8a6 | |
parent | 01f050a935885b50fbcbb345244717b5104f62e4 (diff) | |
parent | 3ce5c6a3f0a086b6c633dbd077ff2cf989af5236 (diff) |
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
-rw-r--r-- | host/include/usrp/usrp_basic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/include/usrp/usrp_basic.h b/host/include/usrp/usrp_basic.h index c24630e..b76493e 100644 --- a/host/include/usrp/usrp_basic.h +++ b/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); |