summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* ctrlport: ControlPort requires SWIG 2.0, so we check for that here; everywher...Tom Rondeau2012-12-041-2/+20
* ctrlport: gets rid of a SWIG warning.Tom Rondeau2012-12-031-4/+35
* ctrlport: fixing up controlport integration into gnuradio-core for merge with...Tom Rondeau2012-12-0334-17/+513
* Merging ctrlport2 into next branch.Tom Rondeau2012-12-0359-0/+7957
* Merge branch 'master' into nextTom Rondeau2012-12-036-4/+10
|\
| * Docs: Fixing Doxygen markup for missing constructor parameters.Tom Rondeau2012-12-034-1/+7
| * core: the mutex is unlocked to begin with and GR doesn't seem to like us forc...Tom Rondeau2012-12-031-1/+0
| * QA: update the 'import pmt' statement to always draw the pmt module from the ...Tom Rondeau2012-12-031-2/+3
* | Merge branch 'master' into nextJohnathan Corgan2012-12-010-0/+0
|\|
| * Merge branch 'maint'Johnathan Corgan2012-12-011-2/+0
| |\
* | \ Merge branch 'master' into nextJohnathan Corgan2012-12-011-2/+0
|\ \ \
| * \ \ Merge branch 'maint'Johnathan Corgan2012-12-012-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Revert "Force swig compile ordering in gnuradio-core"Johnathan Corgan2012-12-011-2/+0
| * | | Merge branch 'maint'Johnathan Corgan2012-12-011-2/+0
| |\ \ \
| | * | | Revert "Force swig compile ordering in gnuradio-core"Johnathan Corgan2012-12-011-2/+0
* | | | | Merge branch 'master' into nextJohnathan Corgan2012-12-012-2/+2
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'maint'Johnathan Corgan2012-12-012-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | cmake: fix typo in cmake swig moduleJohnathan Corgan2012-12-012-2/+2
| | | |/ | | |/|
* | | | Merge branch 'master' into nextJohnathan Corgan2012-12-0113-64/+64
|\| | |
| * | | core: cleanup on pdu/msg blocksJohnathan Corgan2012-12-0113-64/+64
* | | | Merge branch 'master' into nextJohnathan Corgan2012-11-3024-20/+401
|\| | |
| * | | core: gr_blocks can now have only message ports with no general_work()Tim O'Shea2012-11-3024-20/+401
* | | | Merge branch 'master' into nextJohnathan Corgan2012-11-2922-33/+873
|\| | |
| * | | Adding PDU to tagged stream and tagged stream to PDU blocks along with QA pythonJohnathan Corgan2012-11-2922-33/+873
| | |/ | |/|
* | | Merge branch 'master' into nextJohnathan Corgan2012-11-2931-112/+492
|\| |
| * | core: adding msg_connect, updating msg interface, adding symbolic block namesTim O'Shea2012-11-2931-112/+492
* | | Revert "core: adding msg_connect, updating msg interface, adding symbolic blo...Johnathan Corgan2012-11-2931-492/+112
* | | Merge branch 'master' into nextTom Rondeau2012-11-281-1/+1
|\| |
| * | blocks: fix for qa_patterned_interleaver.Tom Rondeau2012-11-281-1/+1
* | | Merge branch 'master' into nextTom Rondeau2012-11-282-1/+2
|\| |
| * | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2012-11-288-0/+298
| |\ \
| * | | build: set Boost_INCLUDE_DIRS for components (mostly for OSX and Windows).Tom Rondeau2012-11-282-1/+2
* | | | Merge branch 'master' into nextJohnathan Corgan2012-11-282-4/+60
|\ \ \ \ | | |/ / | |/| |
| * | | patterned qa added, bugs fixedTim O'Shea2012-11-282-4/+60
* | | | Merge branch 'master' into nextJohnathan Corgan2012-11-287-0/+242
|\| | |
| * | | adding patterned interleaver blockTim O'Shea2012-11-287-0/+242
| |/ /
* | | cmake: don't put etc under /usr.Tom Rondeau2012-11-281-1/+10
* | | core: adding msg_connect, updating msg interface, adding symbolic block namesTim O'Shea2012-11-2831-112/+492
* | | Merge branch 'master' into nextTom Rondeau2012-11-287-3/+314
|\| |
| * | utils: updating GRCC with a -e flag to execute the program after building.Tom Rondeau2012-11-281-2/+12
| * | digital: fixing GRC file id names to build other than top_block.py.Tom Rondeau2012-11-284-4/+4
| * | cmake: adding cmake function to help us run GRCC.Tom Rondeau2012-11-281-0/+67
| * | utils: adding GRCC - a GNU Radio Companion command-line compiler tool.Tom Rondeau2012-11-282-0/+57
* | | Merge branch 'master' into nextTom Rondeau2012-11-2710-4/+907
|\| |
| * | Revert "Revert "Merge remote branch 'jblum-github/python_blocks2' into master""Tom Rondeau2012-11-2710-4/+907
* | | Merge branch 'master' into nextTom Rondeau2012-11-260-0/+0
|\| |
| * | Merge branch 'maint'Tom Rondeau2012-11-262-0/+2
| |\|
| | * core: fixed memory leak issue in arbitrary resampler blocks.Tom Rondeau2012-11-262-0/+2
* | | Merge branch 'master' into nextJohnathan Corgan2012-11-264-4/+5
|\| |
| * | blocks: fix initializer order warningJohnathan Corgan2012-11-262-3/+3