summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nextJohnathan Corgan2016-08-0129-470/+7020
|\
| * Merge remote-tracking branch 'drmpeg/atsc-optimize'Johnathan Corgan2016-08-016-368/+3837
| |\
| | * gr-dtv: Improve ATSC transmitter performance with Rotator block.Ron Economos2016-07-296-368/+3837
| | |
| * | Merge remote-tracking branch 'drmpeg/dtv-build'Johnathan Corgan2016-08-013-19/+2540
| |\ \
| | * | gr-dtv: Make the gr-dtv component easily cross-compiled.Ron Economos2016-07-283-19/+2540
| | |/
| * | Merge remote-tracking branch 'mbr0wn/uhd/uhd_fft_phase_plot'Johnathan Corgan2016-08-011-6/+52
| |\ \
| | * | uhd: uhd_fft can now optionally plot relative phase between adjacent channelsMartin Braun2016-07-181-6/+52
| | | |
| * | | uhd: Updates to UHDApp and siggen appsMartin Braun2016-08-013-65/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added time source option - Fixed bug where sources where not applied to all motherboards - Various formatting cleanups (better Pylint score) - Catch case where lo_locked sensor detection fails
| * | | Merge remote-tracking branch 'iohannez/patch-3'Johnathan Corgan2016-08-011-0/+1
| |\ \ \
| | * | | gr-uhd: create tag when issuing stream commandjohschmitz2016-07-111-0/+1
| | | | |
| * | | | Merge remote-tracking branch 'pinkavaj/tcp_noblock-03'Johnathan Corgan2016-08-0111-0/+472
| |\ \ \ \
| | * | | | tcp_server_sink: XML block definitionJiří Pinkava2016-06-292-0/+78
| | | | | |
| | * | | | tcp_server_sink: generate documentationJiří Pinkava2016-06-292-0/+2
| | | | | |
| | * | | | tcp_server_sink: QAJiří Pinkava2016-06-291-0/+87
| | | | | |
| | * | | | tcp_server_sink: python bindingsJiří Pinkava2016-06-291-0/+3
| | | | | |
| | * | | | tcp_server_sink: implementationJiří Pinkava2016-06-293-0/+235
| | | | | |
| | * | | | tcp_server_sink: header (public interface)Jiří Pinkava2016-06-292-0/+67
| | | | | |
| * | | | | Merge branch 'maint'Johnathan Corgan2016-08-014-12/+21
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | cmake: fix for when tree is git but git describe failsNicholas Corgan2016-08-011-7/+14
| | | | | |
| | * | | | Merge remote-tracking branch 'artem/patch-1' into maintJohnathan Corgan2016-08-011-2/+3
| | |\ \ \ \
| | | * | | | Update dvbt_bit_inner_interleaver_impl.ccArtem Pisarenko2016-07-301-2/+3
| | | | | | | | | | | | | | | | | | | | | Fix out-of-bounds access to array (segmentation fault).
| | * | | | | runtime: fixes prefs system to work with older boost 1.48 and gcc 4.6.3Johnathan Corgan2016-08-011-1/+2
| | | | | | |
| | * | | | | cmake: revert GCC standard to gnu99 to accomodate 4.6.3Johnathan Corgan2016-08-011-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Oldest support gcc for 3.7 series is on Ubuntu 12.04, gcc 4.6.3, which does not support gnu11. * Support for Ubuntu 12.04 will drop off for the 3.8 release.
* | | | | | Merge branch 'master' into nextJohnathan Corgan2016-07-288-14/+13
|\| | | | |
| * | | | | Merge branch 'maint'Johnathan Corgan2016-07-288-14/+13
| |\| | | |
| | * | | | Merge remote-tracking branch 'chrstphrchvz/maint' into maintJohnathan Corgan2016-07-282-2/+2
| | |\ \ \ \
| | | * | | | blocks: fix typoChristopher Chavez2016-07-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | change "but" to "put"
| | | * | | | qtgui: fix spellingChristopher Chavez2016-07-231-1/+1
| | | | |_|/ | | | |/| | | | | | | | | | | | | | change "Verticle" to "Vertical"
| | * | | | Merge remote-tracking branch 'bhilburn/fix-fmdet-cf-impl' into maintJohnathan Corgan2016-07-281-1/+1
| | |\ \ \ \
| | | * | | | Fixing `Sdot` calculation in `fmdet_cf_impl` `work()`Ben Hilburn2016-07-141-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bug reported on-list. Current code actually results in the S1 terms simply canceling each other, whereas the second term should be S2.
| | * | | | Merge remote-tracking branch 'slarew/sgl/maint/gslfix' into maintJohnathan Corgan2016-07-282-1/+2
| | |\ \ \ \
| | | * | | | Fix linking GSL in gr-fecStephen Larew2016-07-092-1/+2
| | | |/ / /
| | * | | | grc: fix handling of initially opened filesSebastian Koslowski2016-07-262-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File paths passed as argument were never converted to absolute paths. So the generator defaulted to /tmp since the directory write check failed (empty dirname)
| | * | | | grc: fix docstring update handlerSebastian Koslowski2016-07-261-1/+1
| | | | | |
* | | | | | Merge branch 'master' into nextJohnathan Corgan2016-07-254-13/+17
|\| | | | |
| * | | | | Merge branch 'maint'Johnathan Corgan2016-07-254-13/+17
| |\| | | | | | |_|_|/ | |/| | |
| | * | | grc: use repr for string-like param type in generator (fixes #926)Sebastian Koslowski2016-07-131-4/+2
| | | | |
| | * | | utils: adapt grcc to refactored grc codeSebastian Koslowski2016-07-071-4/+10
| | | | |
| | * | | grc: fix docstring update error with empty categoriesSebastian Koslowski2016-07-071-3/+3
| | | | |
| | * | | grc: handle corrupted grc.conf more gracefullySebastian Koslowski2016-07-071-2/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | For some reason ConfigParser throws not only their base error put also AttributeError, so catching this from now on. If this proves ineffective we can always catch Exception. See https://groups.google.com/forum/#users/9gWa-3XRpG8 for an error report.
* | | | Merge branch 'master' into nextJohnathan Corgan2016-07-060-0/+0
|\| | | | | | | | | | | | | | | Used merge strategy -s ours to skip master branch commits.
| * | | cmake: update revision to 3.7.11git for developmentJohnathan Corgan2016-07-061-2/+2
| |/ /
* | | Merge branch 'master' into nextJohnathan Corgan2016-07-020-0/+0
|\| | | | | | | | | | | Used merge strategy -s ours to skip release commits on master branch.
| * | cmake: update revision to 3.7.10 for feature releasev3.7.10Johnathan Corgan2016-07-021-2/+2
| | |
| * | Merge branch 'maint'Johnathan Corgan2016-07-020-0/+0
| |\ \ | | | | | | | | | | | | Used merged strategy -s ours to skip release commit on maint branch.
| | * | cmake: update revision to 3.7.9.3 for maintenance releasev3.7.9.3Johnathan Corgan2016-07-021-2/+2
| | | |
* | | | Merge branch 'master' into nextJohnathan Corgan2016-07-023-75/+451
|\| | |
| * | | docs: update release notes for 3.7.10 releaseJohnathan Corgan2016-07-022-37/+377
| | | |
| * | | Merge branch 'maint'Johnathan Corgan2016-07-022-101/+137
| |\| |
| | * | docs: Update release notes for 3.7.9.3 maintenance release.Johnathan Corgan2016-07-022-101/+137
| | | |