summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* blocks: implementing averaging inside rms blocks.Tom Rondeau2013-02-215-14/+18
* Merge branch 'master' into nextTom Rondeau2013-02-2128-4/+2027
|\
| * blocks: converting blocks to v3.7 style in gr-blocks.Tom Rondeau2013-02-2128-4/+2027
* | Merge branch 'master' into nextTom Rondeau2013-02-211-8/+6
|\|
| * Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtoolMartin Braun2013-02-2139-115/+1332
| |\
| * \ Merge branch 'master' of git://github.com/gnuradio/gnuradio into grmodtoolMartin Braun2013-02-151-25/+27
| |\ \
| * | | modtool: fixed order for both 3.6 and 3.7 API versionsMartin Braun2013-02-141-8/+6
* | | | qtgui: fixed a autoscale issue with byte file types.Tom Rondeau2013-02-211-2/+8
* | | | qtgui: adding time raster plot for floats.Tom Rondeau2013-02-213-2/+81
* | | | qtgui: improved handling of static plot tools.Tom Rondeau2013-02-216-21/+21
* | | | qtgui: adding time raster static plot tool.Tom Rondeau2013-02-2116-31/+774
* | | | docs: adding more documentation for ControlPort.Tom Rondeau2013-02-201-0/+217
* | | | ctrlport: made display type in ControlPort setup field into an options mask.Tom Rondeau2013-02-2017-109/+171
* | | | Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2013-02-2028-491/+559
|\ \ \ \
| * | | | qtgui: fixed bounds checking and a typo.Tom Rondeau2013-02-202-6/+12
| * | | | Merge branch 'master' into nextTom Rondeau2013-02-201-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | digital: adding simple_correlator to gr-digital's block tree.Tom Rondeau2013-02-201-0/+1
| * | | | digital: cleaning up conversion to 3.7 for simple_correlator.Tom Rondeau2013-02-2021-701/+20
| * | | | Merge branch 'master' into nextTom Rondeau2013-02-2013-0/+742
| |\| | |
| | * | | blocks: adding count_bits code to gr-blocks.Tom Rondeau2013-02-204-0/+126
| | * | | digital: moved simple_correlator (inverse of simple_framer) to gr-digital.Tom Rondeau2013-02-209-0/+461
* | | | | qtgui: middle button now brings up context menu anywhere on plot.Tom Rondeau2013-02-193-39/+16
* | | | | uhd: fixing incorrect module names for UHD examples.Tom Rondeau2013-02-198-26/+31
* | | | | uhd: converted gr-uhd to v3.7 style.Tom Rondeau2013-02-1921-2249/+2775
|/ / / /
* | | | Merge branch 'master' into nextTom Rondeau2013-02-190-0/+0
|\| | |
| * | | core: removed vestigial debug line.Tom Rondeau2013-02-191-1/+0
* | | | core: removed vestigial debug line.Tom Rondeau2013-02-191-1/+0
* | | | Merge branch 'master' into nextTom Rondeau2013-02-190-0/+0
|\| | |
| * | | core: prefs setup looks for a local .gnuradio/config.conf to use.Tom Rondeau2013-02-191-0/+12
| * | | docs: correcting gr-modtool exclude path for master dir format.Tom Rondeau2013-02-191-1/+1
| * | | docs: adding an exclude rule for gr-modtool to avoid conflicts.Tom Rondeau2013-02-191-1/+2
* | | | core: prefs setup looks for a local .gnuradio/config.conf to use.Tom Rondeau2013-02-191-0/+12
* | | | docs: adding an exclude rule for gr-modtool to avoid conflicts.Tom Rondeau2013-02-191-1/+2
* | | | core: use prefs file to enable/disable ctrlport export of perf. counters.Tom Rondeau2013-02-191-5/+8
* | | | ctrlport: using prefs files to configure ctrlport.Tom Rondeau2013-02-196-44/+45
* | | | ctrlport: adding a config param to enable/disable controlport, default=disabled.Tom Rondeau2013-02-185-7/+26
* | | | core: prefs updated to handle cases of env var delared properly.Tom Rondeau2013-02-182-12/+22
* | | | Merge branch 'master' into nextTom Rondeau2013-02-183-71/+199
|\| | |
| * | | Merge branch 'maint'Tom Rondeau2013-02-183-71/+199
| |\ \ \
| | * | | GRC: adds ability for grc to pull in documentation for blocks from other GR m...Julien Olivain2013-02-181-1/+7
| | * | | howto: copies Doxyxml from main docs to properly pull out block parameters do...Julien Olivain2013-02-182-70/+192
* | | | | Merge branch 'master' into nextJohnathan Corgan2013-02-172-0/+2
|\| | | |
| * | | | Merge branch 'maint'Johnathan Corgan2013-02-172-0/+2
| |\| | |
| | * | | blocks: added missing include for gruel threadJosh Blum2013-02-171-0/+1
| | * | | core: added missing include for gruel threadJosh Blum2013-02-171-0/+1
* | | | | ctrlport: fixing typo in gr_throttle RPC export.Tom Rondeau2013-02-171-1/+1
* | | | | Merge branch 'master' into nextTom Rondeau2013-02-178-12/+236
|\| | | |
| * | | | core: if the config files don't exist, just return an empty list; don't fail.Tom Rondeau2013-02-171-2/+3
| * | | | Merge branch 'cpp_prefs'Tom Rondeau2013-02-178-12/+235
| |\ \ \ \
| | * | | | docs: adding section to main page explaining config files.Tom Rondeau2013-02-161-0/+73