summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into python3Johnathan Corgan2017-10-0518-150/+277
|\
| * Merge branch 'master' into nextJohnathan Corgan2017-10-0518-150/+277
| |\
| | * Merge remote-tracking branch 'github/pr/1479'Johnathan Corgan2017-10-051-0/+1
| | |\
| | | * gr-digital: Install example symbol_sync_test_float_ted_gain.m fileAndy Walls2017-10-041-0/+1
| | * | Merge remote-tracking branch 'github/pr/1472'Johnathan Corgan2017-10-051-1/+3
| | |\ \
| | | * | added glfsr.h to the swig'ed filesMarcus Müller2017-09-261-1/+3
| | | |/
| | * | blocks: fix signedness issues in moving_averageJohnathan Corgan2017-10-051-2/+2
| | * | Merge remote-tracking branch 'github/pr/1462'Johnathan Corgan2017-10-055-45/+91
| | |\ \
| | | * \ Merge branch 'blocks_moving_average_vector_operation' of https://github.com/m...Marcus Müller2017-09-261-5/+7
| | | |\ \
| | | | * | removed zeroing in favour of just setting the first element in the sumMarcus Müller2017-09-121-5/+7
| | | * | | improved order of includes (standards last)Marcus Müller2017-09-261-1/+1
| | | * | | removed print debugging in QA testMarcus Müller2017-09-261-5/+0
| | | |/ /
| | | * | Added a vector operation mode to the moving averageMarcus Müller2017-09-085-23/+102
| | * | | Merge remote-tracking branch 'github/pr/1437'Johnathan Corgan2017-10-053-1/+42
| | |\ \ \
| | | * | | uhd: Parametrize recv timeout and single-packet optionMartin Braun2017-08-213-1/+42
| | * | | | Merge remote-tracking branch 'github/pr/1422'Johnathan Corgan2017-10-057-20/+39
| | |\ \ \ \
| | | * | | | gr-uhd: Added modification to UHD message-based tuning which will allow for t...Jacob Gilbert2017-09-127-20/+39
| | * | | | | Merge branch 'maint'Johnathan Corgan2017-10-054-106/+122
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge remote-tracking branch 'github/pr/1476' into maintJohnathan Corgan2017-10-052-56/+11
| | | |\ \ \ \
| | | | * | | | runtime: Moved block-by-block setup_rpc() calls to the end of the flatten_aux...Jacob Gilbert2017-10-042-56/+12
| | | * | | | | Merge remote-tracking branch 'github/pr/1475' into maintJohnathan Corgan2017-10-051-0/+65
| | | |\ \ \ \ \
| | | | * | | | | [gr-blocks] improve moving_average unit testSebastian Müller2017-09-301-0/+65
| | | | |/ / / /
| | | * / / / / proofed and did minor restructuring of doxygen page on stream tagsMarc L2017-09-261-50/+46
| | | |/ / / /
* | | | | | | Merge branch 'next' into python3Johnathan Corgan2017-09-251-2/+5
|\| | | | | |
| * | | | | | Merge branch 'master' into nextJohnathan Corgan2017-09-251-2/+5
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'github/pr/1440'Johnathan Corgan2017-09-251-2/+5
| | |\ \ \ \ \
| | | * | | | | grc: Avoid use of different style/color icons.Ron Economos2017-08-261-2/+5
| | | | |_|/ / | | | |/| | |
* | | | | | | Merge branch 'next' into python3Johnathan Corgan2017-09-250-0/+0
|\| | | | | |
| * | | | | | Merge branch 'master' into nextJohnathan Corgan2017-09-250-0/+0
| |\| | | | |
| | * | | | | Merge commit 'c0f18d'Johnathan Corgan2017-09-255-4/+138
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge commit '6a6eabc' into nextJohnathan Corgan2017-09-255-3/+136
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge remote-tracking branch 'skoslowski/python3' into python3Johnathan Corgan2017-09-256-2/+133
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'next' into python3Sebastian Koslowski2017-09-065-2/+130
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' into nextSebastian Koslowski2017-08-305-3/+136
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch 'github/pr/1434'Sebastian Koslowski2017-08-305-4/+138
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | grc: Modifications in GRC to allow BokehGUIKartik Patel2017-08-225-4/+138
| | | | | |_|/ / / | | | | |/| | | |
| * | | | | | | | grc: gtk3: fix #1290Sebastian Koslowski2017-08-301-0/+3
* | | | | | | | | Merge remote-tracking branch 'github/pr/1467' into python3Johnathan Corgan2017-09-224-5/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix to make sure the port is a digitHåkon Vågsether2017-09-181-1/+2
| * | | | | | | | | Fix call to check_set_qss() in range.pyHåkon Vågsether2017-09-181-2/+2
| * | | | | | | | | Small Python 3 fixes in the Mako Python templateHåkon Vågsether2017-09-181-2/+10
| * | | | | | | | | Added missing get_opt() in Param.pyHåkon Vågsether2017-09-171-0/+3
| |/ / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'github/pr/1464' into python3Johnathan Corgan2017-09-222-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | grc: Make sure to install the yml filesSylvain Munaut2017-09-111-1/+2
| * | | | | | | | | swig: Install the py3compat.i moduleSylvain Munaut2017-09-111-0/+1
| * | | | | | | | | gr-filter: Complete the rename of filter_fractional_xxx to filter_mmse_xxxSylvain Munaut2017-09-112-0/+0
| |/ / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'github/pr/1435' into python3Johnathan Corgan2017-09-2219-23/+23
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix typos from switch to Python 3Håkon Vågsether2017-08-2119-23/+23
* | | | | | | | | | Merge branch 'next' into python3Johnathan Corgan2017-09-223-1075/+396
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | volk: updated submodule to latest masterJohnathan Corgan2017-09-221-0/+0