Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into next | Johnathan Corgan | 2012-02-17 | 6 | -16/+15 |
|\ | | | | | | | | | | | Conflicts: gr-vocoder/grc/Makefile.am grc/blocks/Makefile.am | ||||
| * | vocoder: add xml blocks to autotools build | Johnathan Corgan | 2012-02-17 | 1 | -2/+23 |
| | | |||||
| * | vocoder: fix typos in added block xml | Johnathan Corgan | 2012-02-17 | 6 | -16/+15 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2012-02-14 | 20 | -0/+496 |
|\| | |||||
| * | Fixed GRC bindings for vocoder (this also fixes GRC example cvsd_sweep) | Martin Braun | 2012-02-14 | 20 | -0/+496 |
| | | |||||
* | | Removed autotools, gr-waveform, some cleanup | Johnathan Corgan | 2011-12-08 | 2 | -31/+0 |
|/ | | | | Nick Foster owes Nick Corgan a six-pack of beer! | ||||
* | gr-vocoder: add skeleton top-level component | Johnathan Corgan | 2011-07-17 | 2 | -0/+31 |