diff options
| author | Johnathan Corgan | 2011-12-11 13:07:11 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2011-12-11 13:07:11 -0800 |
| commit | c51087bb7f005981f4b74c6a48f59a5982721951 (patch) | |
| tree | 07905082947d982034a5b3b2f4426a3c3a203d0b /gnuradio-core/src | |
| parent | 912cd08e133dae9fa9ceec055ba23cd970a0c254 (diff) | |
| parent | fe21bc676424196a228ba4fe9c924e3ae1954e07 (diff) | |
| download | gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.tar.gz gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.tar.bz2 gnuradio-c51087bb7f005981f4b74c6a48f59a5982721951.zip | |
Merge branch 'master' into next
Conflicts:
config/lf_warnings.m4
volk/config/lf_warnings.m4
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_simple_framer_sync.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_simple_framer_sync.h b/gnuradio-core/src/lib/general/gr_simple_framer_sync.h index d5712fe8e..f28230b15 100644 --- a/gnuradio-core/src/lib/general/gr_simple_framer_sync.h +++ b/gnuradio-core/src/lib/general/gr_simple_framer_sync.h @@ -26,7 +26,7 @@ /*! * \brief Here are a couple of maximum length sequences (m-sequences) that were generated by the * the "mseq" matlab/octave code downloaded from: - * http://www.mathworks.com/matlabcentral/fileexchange/loadFile.do?objectId=990&objectType=file + * <a href="http://www.mathworks.com/matlabcentral/fileexchange/990">http://www.mathworks.com/matlabcentral/fileexchange/990</a> * * <pre> * 31-bit m-sequence: |