summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-01-022-2/+2
|\
| * Merge branch 'master' into nextTom Rondeau2013-01-021-1/+1
| |\
| | * Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2013-01-022-8/+14
| | |\
| | * | docs: fixing typo.Tom Rondeau2013-01-021-1/+1
| * | | pmt: fixed where pmt's __init__.py script gets installed.Tom Rondeau2013-01-021-1/+1
* | | | ctrlport: removing unused and unecessary file.Tom Rondeau2013-01-021-126/+0
|/ / /
* | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-01-022-8/+14
|\ \ \
| * \ \ Merge branch 'master' into nextJohnathan Corgan2013-01-022-8/+14
| |\ \ \ | | | |/ | | |/|
| | * | blocks: fixed file_meta_sink/source_impl MSVC incompatibliity errorNicholas Corgan2013-01-022-8/+14
| | |/
* | | pmt: too hasty in fixing a conflict in the merge.Tom Rondeau2013-01-021-9/+9
* | | Merge branch 'pmt_rename' into nextTom Rondeau2013-01-0257-2300/+1829
|\ \ \ | |/ / |/| |
| * | pmt: updated pmt docs for new naming scheme.Tom Rondeau2013-01-021-91/+95
| * | gruel: using new pmt naming.Tom Rondeau2012-12-216-131/+130
| * | gruel: updating all GR blocks that use PMTs to use new naming.Tom Rondeau2012-12-2139-309/+303
| * | gruel: Renaming PMT function to get rid of pmt_ prefix.Tom Rondeau2012-12-2111-1776/+1283
| * | gruel: adding a 'pmt_from_complex' call (more clear than pmt_make_rectangular).Tom Rondeau2012-12-214-0/+30
| * | gruel: pmt_Xvector_elements can be used in Python to return a Python tuple.Tom Rondeau2012-12-213-31/+43
* | | Merge branch 'master' into nextJohnathan Corgan2012-12-312-11/+11
|\ \ \ | | |/ | |/|
| * | core: fixed some unused parameter warningsAlexandru Csete2012-12-312-11/+11
* | | wxgui: using logpwrfft properly from gr-fft.Tom Rondeau2012-12-311-2/+3
* | | analog: fixing up UHD apps to use gr-analog module.Tom Rondeau2012-12-314-9/+12
* | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-12-31236-9385/+8460
|\ \ \
| * \ \ Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-12-301-1/+2
| |\ \ \
| * | | | core: removed test to import blks2 since we've removed all of blks2/blks2impl.Tom Rondeau2012-12-301-4/+0
| * | | | video-sdl: converted to new structure.Tom Rondeau2012-12-3021-954/+1180
| * | | | utils: minor change to convert gr-utils to new stucture.Tom Rondeau2012-12-2926-2/+2
| * | | | Merge branch 'next_blocks' into nextTom Rondeau2012-12-29438-14676/+1239
| |\ \ \ \
| | * | | | grc: updating GRC exmaples for new component changes.Tom Rondeau2012-12-2728-874/+468
| | * | | | filter: moved window around so it's available in both gr-fft and gr-filter.Tom Rondeau2012-12-276-3/+186
| * | | | | trellis: converted gr-trellis to new style.Tom Rondeau2012-12-29162-7746/+6822
* | | | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-12-303-4/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge branch 'master' into nextJohnathan Corgan2012-12-291-1/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'maint'Johnathan Corgan2012-12-291-1/+2
| | |\ \
| | | * | cmake: removed Boost 1.52 from allowed versionsmaint-3.6.2Johnathan Corgan2012-12-291-1/+2
| * | | | filter: handle a log10(0) warning that causes QT to crash when designing filt...Tom Rondeau2012-12-272-3/+7
| * | | | Merge branch 'master' into nextJohnathan Corgan2012-12-230-0/+0
| |\| | |
| | * | | cmake: update revision to 3.6.3rc0v3.6.3rc0Johnathan Corgan2012-12-231-2/+2
* | | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2012-12-217-16/+24
|\| | | |
| * | | | Merge branch 'master' into nextJohnathan Corgan2012-12-201-0/+1
| |\| | |
| | * | | Merge branch 'maint'Johnathan Corgan2012-12-201-0/+1
| | |\| |
| | | * | Revert "gruel: remove erroneous include path from cmake"Nicholas Corgan2012-12-141-0/+1
| * | | | Merge branch 'master' into nextJohnathan Corgan2012-12-206-16/+23
| |\| | |
| | * | | Merge remote-tracking branch 'ncorgan/pdu_fix'Johnathan Corgan2012-12-206-16/+23
| | |\ \ \
| | | * | | core: fixed pdu MSVC compatibility issuesNicholas Corgan2012-12-206-16/+23
| * | | | | Merge branch 'master' into nextTom Rondeau2012-12-205-31/+73
| |\| | | | | | |_|_|/ | |/| | |
| | * | | gruel: adding a 'pmt_from_complex' call (more clear than pmt_make_rectangular).Tom Rondeau2012-12-204-0/+30
| | * | | gruel: pmt_Xvector_elements can be used in Python to return a Python tuple.Tom Rondeau2012-12-193-31/+43
| | |/ /
* | | | blocks: removes blocks moved to gr-blocks from gnuradio-core.Tom Rondeau2012-12-21415-13981/+767
* | | | gruel: adding a 'pmt_from_complex' call (more clear than pmt_make_rectangular).Tom Rondeau2012-12-214-0/+30
* | | | gruel: pmt_Xvector_elements can be used in Python to return a Python tuple.Tom Rondeau2012-12-213-31/+43
|/ / /