| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'deprecate-blks2' into rm-blks2 | Johnathan Corgan | 2016-10-23 | 4 | -0/+16 |
|\ |
|
| * | gr-blocks: add warnings to deprected blks2 blocks | Johnathan Corgan | 2016-10-23 | 4 | -0/+16 |
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-21 | 2 | -2/+2 |
|\| |
|
| * | Merge branch 'maint' | Johnathan Corgan | 2016-10-21 | 2 | -2/+2 |
| |\ |
|
| | * | Merge remote-tracking branch 'skoslowski/issue1043' into maint | Johnathan Corgan | 2016-10-21 | 1 | -1/+1 |
| | |\ |
|
| | | * | grc: fix IndexError when consuming \b in console (#1043) | Sebastian Koslowski | 2016-10-21 | 1 | -1/+1 |
| | * | | grc: change default filepath to documents dir for windows only | gnieboer | 2016-10-21 | 1 | -1/+1 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-21 | 0 | -0/+0 |
|\| | | |
|
| * | | | Merge branch 'maint' | Johnathan Corgan | 2016-10-21 | 16 | -80/+80 |
| |\| | |
|
| | * | | Backport GRC Python code for Python-2.6.6+ | Ben Hilburn | 2016-10-17 | 16 | -80/+80 |
| | |/ |
|
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-17 | 22 | -83/+70 |
|\| | |
|
| * | | Merge remote-tracking branch 'drmpeg/dvb-s2x-fix' | Johnathan Corgan | 2016-10-17 | 1 | -12/+0 |
| |\ \ |
|
| | * | | dtv: Remove incorrect normalization on DVB-S2X constellations. | Ron Economos | 2016-10-14 | 1 | -12/+0 |
| * | | | Merge remote-tracking branch 'osh/qtgui_qss_fix' | Johnathan Corgan | 2016-10-17 | 21 | -71/+70 |
| |\ \ \ |
|
| | * | | | qtgui: adding util.py | Tim O'Shea | 2016-10-17 | 1 | -0/+35 |
| | * | | | qtgui: make sure QSS style is applied to Qt gui even when no plotter is attached | Tim O'Shea | 2016-10-14 | 20 | -71/+35 |
| | |/ / |
|
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-13 | 6 | -176/+379 |
|\| | | |
|
| * | | | Merge remote-tracking branch 'mbr0wn/uhd/uhd_fft_multi_spec' | Johnathan Corgan | 2016-10-13 | 1 | -3/+21 |
| |\ \ \ |
|
| | * | | | uhd: uhd_apps may now specify multiple subdev specs | Martin Braun | 2016-10-12 | 1 | -3/+21 |
| | |/ / |
|
| * | | | Merge remote-tracking branch 'gnieboer/gnieboer-patch-17-winaudio-sink-block' | Johnathan Corgan | 2016-10-13 | 2 | -12/+24 |
| |\ \ \ |
|
| | * | | | gr-audio: implemented blocking in windows audio sink | gnieboer | 2016-10-12 | 2 | -12/+24 |
| | |/ / |
|
| * | | | Merge remote-tracking branch 'gnieboer/gnieboer-patch-16-winaudio-source' | Johnathan Corgan | 2016-10-13 | 2 | -161/+331 |
| |\ \ \ |
|
| | * | | | gr-audio: Refactored windows audio source see github #939 | gnieboer | 2016-10-12 | 2 | -161/+331 |
| | |/ / |
|
| * | | | Merge branch 'maint' | Johnathan Corgan | 2016-10-13 | 1 | -0/+3 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | Throw an exception if the given K and R are not supported. | Clayton Smith | 2016-10-13 | 1 | -0/+3 |
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-02 | 3 | -4/+71 |
|\| | |
|
| * | | Merge branch 'maint' | Johnathan Corgan | 2016-10-02 | 3 | -4/+71 |
| |\| |
|
| | * | Merge remote-tracking branch 'bastibl/connect_msg_ports' into maint | Johnathan Corgan | 2016-10-02 | 2 | -0/+67 |
| | |\ |
|
| | | * | runtime: add qa for flowgraph | Bastian Bloessl | 2016-10-01 | 1 | -0/+58 |
| | | * | runtime: connect message ports after unlock() | Bastian Bloessl | 2016-09-30 | 1 | -0/+9 |
| | * | | Qt time sink now respects tag color from QSS stylesheet | Johannes Demel | 2016-10-02 | 1 | -4/+4 |
| | |/ |
|
* | | | Merge remote-tracking branch 'skoslowski/grcc_refactor' into next | Johnathan Corgan | 2016-09-28 | 13 | -158/+532 |
|\ \ \ |
|
| * | | | grc: changes to grcc CLI | Sebastian Koslowski | 2016-09-28 | 2 | -14/+21 |
| * | | | grc: add some test code for grcc | Sebastian Koslowski | 2016-09-23 | 2 | -0/+287 |
| * | | | grc: rewrite grcc | Sebastian Koslowski | 2016-09-23 | 4 | -83/+131 |
| * | | | grc: make recursive flow graph load and generate more flexible | Sebastian Koslowski | 2016-09-23 | 2 | -12/+13 |
| * | | | grc: move run command getter to core | Sebastian Koslowski | 2016-09-23 | 3 | -36/+68 |
| * | | | grc: move grcc into grc subtree | Sebastian Koslowski | 2016-09-23 | 3 | -2/+1 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-28 | 1 | -11/+11 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'maint' | Johnathan Corgan | 2016-09-28 | 1 | -11/+11 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | qtgui: whitespace fix (gcc warning "misleading-indentation") | Sebastian Koslowski | 2016-09-28 | 1 | -11/+11 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-26 | 1 | -8/+11 |
|\| | | |
|
| * | | | Merge branch 'maint' | Johnathan Corgan | 2016-09-26 | 1 | -8/+11 |
| |\| | |
|
| | * | | Bug fix: performance counter's clock option (i.e. thread or monotonic) was | Pedro Lobo | 2016-09-26 | 1 | -8/+11 |
* | | | | uhd: Updated minimum version to 3.5.5 and removed deprecated code | Martin Braun | 2016-09-24 | 9 | -267/+19 |
* | | | | Merge branch 'master' into next | Johnathan Corgan | 2016-09-24 | 2 | -11/+11 |
|\| | |
| |_|/
|/| | |
|
| * | | Merge remote-tracking branch 'mbr0wn/uhd/recv' | Johnathan Corgan | 2016-09-24 | 2 | -11/+11 |
| |\ \ |
|
| | * | | uhd: Replace zero-timeout double-recv() with one recv() call | Martin Braun | 2016-09-23 | 2 | -11/+11 |
| * | | | Merge branch 'maint' | Johnathan Corgan | 2016-09-24 | 4 | -378/+532 |
| |\ \ \
| | |/ /
| |/| /
| | |/ |
|
| | * | fcd: Update hidapi to latest HEAD. | Alexandru Csete | 2016-09-23 | 4 | -378/+532 |