diff options
| author | Tom Rondeau | 2011-09-02 12:15:24 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-09-02 12:15:24 -0400 |
| commit | 492446d2ec6ed85d6437bb35caf4700b02930147 (patch) | |
| tree | 28ae6ce82b4d3879dd334625146ce3c8c0bb789f /gnuradio-examples/grc/Makefile.am | |
| parent | 52f9290374a64fef2ff2c0f9199166bed27fc955 (diff) | |
| parent | 0f43bdb085f98e1182dbd940db9ed1fb52119186 (diff) | |
| download | gnuradio-492446d2ec6ed85d6437bb35caf4700b02930147.tar.gz gnuradio-492446d2ec6ed85d6437bb35caf4700b02930147.tar.bz2 gnuradio-492446d2ec6ed85d6437bb35caf4700b02930147.zip | |
Merge branch 'master' into next
* master:
Minor fixes in turbo GRC blocks
Minor fixes in turbo GRC blocks and one more example added.
Added pccc combined turbo decoder and corresponding GRC block
More examples and turbo decoder blocks added.
Added more turbo encoder/decoder blocks and examples.
Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc blocks related to trellis inside the gr-trellis/grc directory
added grc directory in gr-trellis
updated Makefile.am and block_tree.xml to reflect changes in grc file for gr-trellis
Moved grc files from grc/block to gr-trellis/grc
Diffstat (limited to 'gnuradio-examples/grc/Makefile.am')
0 files changed, 0 insertions, 0 deletions