summaryrefslogtreecommitdiff
path: root/gnuradio-core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into nextJohnathan Corgan2012-09-293-6/+10
|\
| * core: udp source wait mode yields work threadJosh Blum2012-09-291-4/+6
| * core: source block can yield thread context/produce noneJosh Blum2012-09-291-0/+2
| * core: fix implicit assumption in skipheadJosh Blum2012-09-291-2/+2
* | Merge branch 'master' into nextJohnathan Corgan2012-09-271-1/+1
|\|
| * core: fix use of private vars in place of API accessorJosh Blum2012-09-272-2/+2
| * digital: fix private access in gr_endian_swapJosh Blum2012-09-271-1/+1
* | core: dont export totally inline classesJosh Blum2012-09-072-2/+2
* | Examples: Fixed minor bugs in examples and blks2impl from namespace changes.Ben Reynwar2012-09-043-9/+9
* | Merge branch 'master' into nextJohnathan Corgan2012-09-041-5/+6
|\|
| * Merge branch 'maint'Johnathan Corgan2012-09-041-5/+6
| |\
| | * core: only check for *.conf in prefs dirmaint-3.6.1Martin Braun2012-09-041-5/+6
* | | Merge branch 'master' into nextTom Rondeau2012-08-306-0/+258
|\| |
| * | adding gr_endian_swap blockTim O'Shea2012-08-306-0/+258
* | | Merge remote branch 'reynwar/comments_next' into nextJohnathan Corgan2012-08-2822-163/+202
|\ \ \
| * | | docs: Changed arguments in python docstrings to new formatting style.Ben Reynwar2012-08-1416-173/+192
| * | | docs: Formatted python docstrings for sphinx docs.Ben Reynwar2012-08-132-1/+9
| * | | Merged comments branch into comments_next branch.Ben Reynwar2012-08-105-1/+25
| |\ \ \
| | * | | Merge branch 'master' into commentsBen Reynwar2012-08-0866-499/+1975
| | |\| |
| | * | | docs: Adding/editing top-level docstrings.Ben Reynwar2012-05-215-1/+25
* | | | | Merge remote branch 'jblum/fix_private_access' into nextJohnathan Corgan2012-08-282-2/+2
|\ \ \ \ \
| * | | | | core: fix use of private vars in place of API accessorJosh Blum2012-08-142-2/+2
| |/ / / /
* | | | | docs: fixed doxygen markup issues.Tom Rondeau2012-08-282-1/+5
* | | | | filter: fixing PFB GRC blocks.Tom Rondeau2012-08-224-340/+0
* | | | | core: fixing location of some components for the new hierarchy.Tom Rondeau2012-08-222-156/+0
* | | | | core: removed fft blocks from core (now only in gr-fft).Tom Rondeau2012-08-2011-855/+0
* | | | | core: fixed default upper-limit on noutput_items to make sure we don't normal...Tom Rondeau2012-08-204-6/+6
* | | | | core: allowing gri_control_loop to be a pure-virtual parent class.Tom Rondeau2012-08-201-0/+1
* | | | | swig: adds a macro to allow us to specify different factory functions besides...Tom Rondeau2012-08-171-0/+8
* | | | | Merge remote-tracking branch 'jcorgan/wip/filter-rm-next' into digital_implTom Rondeau2012-08-10299-33138/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'next' into wip/filter-rm-nextJohnathan Corgan2012-07-0710-902/+4
| |\ \ \ \
| * | | | | core: update to build.Tom Rondeau2012-07-071-1/+0
| * | | | | Merge branch 'next' into wip/filter-rm-nextJohnathan Corgan2012-07-0313-338/+933
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'next' into wip/filter-rm-nextJohnathan Corgan2012-07-011-17/+29
| |\ \ \ \ \ \
| * | | | | | | core: fix missing update from dc172e5dJohnathan Corgan2012-06-241-6/+1
| * | | | | | | Merge branch 'next' into wip/filter-rm-nextJohnathan Corgan2012-06-239-117/+303
| |\ \ \ \ \ \ \
| * | | | | | | | core: wip, first pass to remove filter/hier blocks after migration to gr-filterJohnathan Corgan2012-06-23298-33130/+3
* | | | | | | | | Merge branch 'master' into nextTom Rondeau2012-08-053-2/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | arm: better support for ARM processors without NEON.Jaroslav Skarvada2012-08-053-2/+5
* | | | | | | | | Merge branch 'qtsink_menus' into nextTom Rondeau2012-07-296-9/+70
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'next' into qtsink_menusTom Rondeau2012-07-1771-4420/+62
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | core: adding ability to change and reset skiphead parameters.Tom Rondeau2012-07-053-4/+54
| * | | | | | | | | fft: adding a malloc for doubles.Tom Rondeau2012-07-032-5/+15
| * | | | | | | | | Merge branch 'master' into my_qtsinkTom Rondeau2012-06-241222-7971/+9492
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | tags: some fixes to the tagged_file_sink block.Jeff Long2012-07-291-5/+18
* | | | | | | | | | | Merge branch 'master' into nextTom Rondeau2012-07-195-0/+256
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | core: added message source that takes in tags for controlling bursts.Nick Foster2012-07-195-0/+256
* | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2012-07-0710-902/+4
|\| | | | | | | | | | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Revert "Merge remote branch 'jblum-github/python_blocks2' into master"Johnathan Corgan2012-07-0710-902/+4
* | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2012-07-034-334/+31
|\| | | | | | | |