diff options
| author | Tom Rondeau | 2010-12-23 22:13:36 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-12-23 22:13:36 -0500 |
| commit | d209240b15f98233770efd4b184fe429ba77171a (patch) | |
| tree | c13f34c2f124d6384426992056a07582acf2a80d /gruel/Makefile.am | |
| parent | 79c514b542d25e709903b41cfdc1673aae35ac1d (diff) | |
| parent | 7222b938cbfe0afd0886e4ce5e032cb756724903 (diff) | |
| download | gnuradio-d209240b15f98233770efd4b184fe429ba77171a.tar.gz gnuradio-d209240b15f98233770efd4b184fe429ba77171a.tar.bz2 gnuradio-d209240b15f98233770efd4b184fe429ba77171a.zip | |
Merge branch 'master' into next
* master:
clean now gets rid of unittest results. Passes distcheck.
Modifying the unittest output. XML files are no longer written outside of the build tree.
A new patch for fixing the alsa restart issue. Submitted by Volker Schroer.
Reverting last change in alsa.
PFB resampler: fix it this way to avoid the signed/unsigned warning.
PFB resampler: fixes bug where filter could be looking past the number of inputs.
Adding a "change in progress" check to alsa sink.
Added a check in alsa sink if error has occurred due to blocking; if so, it will just drop samples and not get backed up. Patch taken from Marcus Leech 10/29/2010.
Conflicts:
Makefile.common
gnuradio-core/src/lib/filter/gr_pfb_arb_resampler_ccf.cc
Diffstat (limited to 'gruel/Makefile.am')
0 files changed, 0 insertions, 0 deletions