summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJohnathan Corgan2012-02-176-16/+15
|\
| * Merge branch 'maint'Johnathan Corgan2012-02-179-47/+38
| |\
| | * vocoder: add xml blocks to autotools buildJohnathan Corgan2012-02-172-4/+23
| | * vocoder: fix typos in added block xmlJohnathan Corgan2012-02-177-43/+15
* | | Merge branch 'master' into nextTom Rondeau2012-02-174-21/+92
|\| |
| * | core: protection if set_delay is called before the last delay update has fini...Tom Rondeau2012-02-171-1/+1
| * | Merge branch 'dyn_delay'Tom Rondeau2012-02-174-21/+92
| |\ \
| | * | core: in delay block, protect against repeated calls to set_delay with the sa...Tom Rondeau2012-02-171-5/+10
| | * | copyright adjustment.Tom Rondeau2012-02-161-1/+1
| | * | core: core: change to the delay QA code.Tom Rondeau2012-02-161-1/+1
| | * | core: allowing delay to be dynamic for runtime changes to set_delay.Tom Rondeau2012-02-163-19/+85
* | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-02-171-15/+64
|\ \ \ \
| * | | | Merge branch 'master' into nextJohnathan Corgan2012-02-161-15/+64
| |\| | |
| | * | | Merge branch 'maint'Johnathan Corgan2012-02-161-15/+64
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * small tweaks to get stream sizes "more correct"Michael L Dickens2012-02-161-7/+7
| | | * allow any input hardware audio rate; fix use of deprecated function 'AudioHar...Michael Dickens2012-02-161-11/+60
* | | | howto: moving uninstall rules into correct location.Tom Rondeau2012-02-171-0/+0
|/ / /
* | | Merge branch 'master' into nextTom Rondeau2012-02-151-0/+14
|\| |
| * | Merge branch 'maint'Tom Rondeau2012-02-151-0/+14
| |\|
| | * digital: install OFDM examples into installed examples directory.Michael Dickens2012-02-151-0/+14
* | | Merge branch 'master' into nextJohnathan Corgan2012-02-1424-20/+448
|\| |
| * | Merge branch 'maint'Johnathan Corgan2012-02-1424-20/+448
| |\|
| | * Fixed GRC bindings for vocoder (this also fixes GRC example cvsd_sweep)Martin Braun2012-02-1423-18/+446
| | * uhd: fix source block xml file generationMichael Dickens2012-02-141-2/+2
* | | Merge branch 'master' into nextTom Rondeau2012-02-141-8/+0
|\| |
| * | Merge branch 'maint'Tom Rondeau2012-02-141-8/+0
| |\|
| | * docs: removing old Doxygen groups (radar and usrp(2)).Martin Braun2012-02-141-8/+0
* | | Merge branch 'master' into nextTom Rondeau2012-02-101-0/+2
|\| |
| * | docs: applying operator fix to howto-write-a-block, too.Marcus Mueller2012-02-101-0/+2
* | | Merge branch 'master' into nextTom Rondeau2012-02-103-1/+47
|\| |
| * | docs: swig_docs don't look at operators when building Python documentation.Marcus Mueller2012-02-101-0/+2
| * | Merge branch 'maint'Tom Rondeau2012-02-102-1/+45
| |\|
| | * cmake: adding uninstall target for howto-write-a-block-cmake.Martin Braun2012-02-102-1/+45
* | | Merge branch 'master' into nextTom Rondeau2012-02-081-2/+2
|\| |
| * | cmake: fix for handling fftw_threads as an optional library only.Tom Rondeau2012-02-081-2/+2
* | | Merge branch 'master' into nextTom Rondeau2012-02-073-6/+18
|\| |
| * | Merge branch 'maint'Tom Rondeau2012-02-073-6/+18
| |\|
| | * docs: better handling of html only for formulas.Tom Rondeau2012-02-073-6/+18
* | | Merge branch 'master' into nextTom Rondeau2012-02-061-18/+46
|\| |
| * | gui: better handling of buffers in oscope for stripchart/non-stripchart.Marcus Leech2012-02-061-18/+46
* | | Merge branch 'master' into nextJohnathan Corgan2012-02-061-1/+1
|\| |
| * | Merge branch 'maint'Johnathan Corgan2012-02-061-1/+1
| |\|
| | * Merge remote branch 'ncorgan/package-version-fix' into maintJohnathan Corgan2012-02-061-1/+1
| | |\
| | | * CMake package uses "X.X.X" version number instead of "vX.X.X"Nicholas Corgan2012-02-061-1/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2012-02-061-1/+1
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2012-02-061-1/+1
| |\| |
| | * | Revert "dpkg rejects "vX.X.X" version number because it doesn't start with a ...Johnathan Corgan2012-02-061-1/+1
* | | | Merge branch 'master' into nextTom Rondeau2012-02-0612-34/+98
|\| | |
| * | | Merge branch 'maint'Tom Rondeau2012-02-064-16/+34
| |\| |
| | * | Merge branch 'maint' of gnuradio.org:gnuradio into maintTom Rondeau2012-02-061-1/+1
| | |\ \