summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'deprecate-blks2' into rm-blks2Johnathan Corgan2016-10-234-0/+16
|\
| * gr-blocks: add warnings to deprected blks2 blocksJohnathan Corgan2016-10-234-0/+16
* | Merge branch 'master' into nextJohnathan Corgan2016-10-212-2/+2
|\|
| * Merge branch 'maint'Johnathan Corgan2016-10-212-2/+2
| |\
| | * Merge remote-tracking branch 'skoslowski/issue1043' into maintJohnathan Corgan2016-10-211-1/+1
| | |\
| | | * grc: fix IndexError when consuming \b in console (#1043)Sebastian Koslowski2016-10-211-1/+1
| | * | grc: change default filepath to documents dir for windows onlygnieboer2016-10-211-1/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2016-10-210-0/+0
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2016-10-2116-80/+80
| |\| |
| | * | Backport GRC Python code for Python-2.6.6+Ben Hilburn2016-10-1716-80/+80
| | |/
* | | Merge branch 'master' into nextJohnathan Corgan2016-10-1722-83/+70
|\| |
| * | Merge remote-tracking branch 'drmpeg/dvb-s2x-fix'Johnathan Corgan2016-10-171-12/+0
| |\ \
| | * | dtv: Remove incorrect normalization on DVB-S2X constellations.Ron Economos2016-10-141-12/+0
| * | | Merge remote-tracking branch 'osh/qtgui_qss_fix'Johnathan Corgan2016-10-1721-71/+70
| |\ \ \
| | * | | qtgui: adding util.pyTim O'Shea2016-10-171-0/+35
| | * | | qtgui: make sure QSS style is applied to Qt gui even when no plotter is attachedTim O'Shea2016-10-1420-71/+35
| | |/ /
* | | | Merge branch 'master' into nextJohnathan Corgan2016-10-136-176/+379
|\| | |
| * | | Merge remote-tracking branch 'mbr0wn/uhd/uhd_fft_multi_spec'Johnathan Corgan2016-10-131-3/+21
| |\ \ \
| | * | | uhd: uhd_apps may now specify multiple subdev specsMartin Braun2016-10-121-3/+21
| | |/ /
| * | | Merge remote-tracking branch 'gnieboer/gnieboer-patch-17-winaudio-sink-block'Johnathan Corgan2016-10-132-12/+24
| |\ \ \
| | * | | gr-audio: implemented blocking in windows audio sinkgnieboer2016-10-122-12/+24
| | |/ /
| * | | Merge remote-tracking branch 'gnieboer/gnieboer-patch-16-winaudio-source'Johnathan Corgan2016-10-132-161/+331
| |\ \ \
| | * | | gr-audio: Refactored windows audio source see github #939gnieboer2016-10-122-161/+331
| | |/ /
| * | | Merge branch 'maint'Johnathan Corgan2016-10-131-0/+3
| |\ \ \ | | |/ / | |/| / | | |/
| | * Throw an exception if the given K and R are not supported.Clayton Smith2016-10-131-0/+3
* | | Merge branch 'master' into nextJohnathan Corgan2016-10-023-4/+71
|\| |
| * | Merge branch 'maint'Johnathan Corgan2016-10-023-4/+71
| |\|
| | * Merge remote-tracking branch 'bastibl/connect_msg_ports' into maintJohnathan Corgan2016-10-022-0/+67
| | |\
| | | * runtime: add qa for flowgraphBastian Bloessl2016-10-011-0/+58
| | | * runtime: connect message ports after unlock()Bastian Bloessl2016-09-301-0/+9
| | * | Qt time sink now respects tag color from QSS stylesheetJohannes Demel2016-10-021-4/+4
| | |/
* | | Merge remote-tracking branch 'skoslowski/grcc_refactor' into nextJohnathan Corgan2016-09-2813-158/+532
|\ \ \
| * | | grc: changes to grcc CLISebastian Koslowski2016-09-282-14/+21
| * | | grc: add some test code for grccSebastian Koslowski2016-09-232-0/+287
| * | | grc: rewrite grccSebastian Koslowski2016-09-234-83/+131
| * | | grc: make recursive flow graph load and generate more flexibleSebastian Koslowski2016-09-232-12/+13
| * | | grc: move run command getter to coreSebastian Koslowski2016-09-233-36/+68
| * | | grc: move grcc into grc subtreeSebastian Koslowski2016-09-233-2/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2016-09-281-11/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint'Johnathan Corgan2016-09-281-11/+11
| |\ \ \ | | | |/ | | |/|
| | * | qtgui: whitespace fix (gcc warning "misleading-indentation")Sebastian Koslowski2016-09-281-11/+11
* | | | Merge branch 'master' into nextJohnathan Corgan2016-09-261-8/+11
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2016-09-261-8/+11
| |\| |
| | * | Bug fix: performance counter's clock option (i.e. thread or monotonic) wasPedro Lobo2016-09-261-8/+11
* | | | uhd: Updated minimum version to 3.5.5 and removed deprecated codeMartin Braun2016-09-249-267/+19
* | | | Merge branch 'master' into nextJohnathan Corgan2016-09-242-11/+11
|\| | | | |_|/ |/| |
| * | Merge remote-tracking branch 'mbr0wn/uhd/recv'Johnathan Corgan2016-09-242-11/+11
| |\ \
| | * | uhd: Replace zero-timeout double-recv() with one recv() callMartin Braun2016-09-232-11/+11
| * | | Merge branch 'maint'Johnathan Corgan2016-09-244-378/+532
| |\ \ \ | | |/ / | |/| / | | |/
| | * fcd: Update hidapi to latest HEAD.Alexandru Csete2016-09-234-378/+532