summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into python3Johnathan Corgan2017-06-274-15/+15
|\
| * Merge branch 'master' into nextJohnathan Corgan2017-06-274-15/+15
| |\
| | * Merge branch 'maint'Johnathan Corgan2017-06-274-15/+15
| | |\
| | | * Revert "Fixed storing references to temporary values in RPC infrastructure"Johnathan Corgan2017-06-274-15/+15
* | | | Merge branch 'next' into python3Johnathan Corgan2017-06-2719-85/+64
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2017-06-2719-85/+64
| |\| |
| | * | Merge remote-tracking branch 'github/pr/1344'Johnathan Corgan2017-06-273-7/+10
| | |\ \
| | | * | dtv: Update ITU-T J.83B transmitter block documentation.Ron Economos2017-06-243-7/+10
| | * | | Merge remote-tracking branch 'github/pr/1340'Johnathan Corgan2017-06-271-2/+1
| | |\ \ \
| | | * | | dtv: Fix Coverity issue #1376468.Ron Economos2017-06-231-2/+1
| | | |/ /
| | * | | Merge branch 'maint'Johnathan Corgan2017-06-2715-76/+53
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge remote-tracking branch 'github/pr/1349' into maintJohnathan Corgan2017-06-271-1/+10
| | | |\
| | | | * Fix: hazardous floating point sqrt(1.0 - (1.0+-epsilon)²)Marcus Müller2017-06-271-1/+10
| | | * | Merge remote-tracking branch 'github/pr/1341' into maintJohnathan Corgan2017-06-279-57/+28
| | | |\ \
| | | | * | fix: can't pass non-enum integer as enum parameter (#1337)Marcus Müller2017-06-249-57/+28
| | | | |/
| | | * | Merge remote-tracking branch 'github/pr/1343' into maintJohnathan Corgan2017-06-274-15/+15
| | | |\ \
| | | | * | Fixed storing references to temporary values in RPC infrastructureMarcus Müller2017-06-244-15/+15
| | | | |/
| | | * | Merge remote-tracking branch 'github/pr/1342' into maintJohnathan Corgan2017-06-271-3/+0
| | | |\ \
| | | | * | removed redundant unsigned int < 0 check.Marcus Müller2017-06-241-3/+0
| | | | |/
* | | | | Merge branch 'next' into python3Johnathan Corgan2017-06-2231-103/+4089
|\| | | |
| * | | | Merge branch 'master' into nextJohnathan Corgan2017-06-2231-103/+4089
| |\| | |
| | * | | Merge remote-tracking branch 'github/pr/1336'Johnathan Corgan2017-06-2220-74/+3875
| | |\ \ \
| | | * | | dtv: Add 256QAM mode to ITU-T J.83B transmitter.Ron Economos2017-06-1820-74/+3875
| | * | | | Merge remote-tracking branch 'github/pr/1333'Johnathan Corgan2017-06-222-8/+16
| | |\ \ \ \
| | | * | | | gr-runtime-test: changed test memory allocation from stack to help to avoid o...gnieboer2017-06-132-8/+16
| | | | |_|/ | | | |/| |
| | * | | | Merge remote-tracking branch 'github/pr/1328'Johnathan Corgan2017-06-221-14/+5
| | |\ \ \ \
| | | * | | | uhd: Properly normalized selection of options for multi-device opsMartin Braun2017-06-091-14/+5
| | | | |/ / | | | |/| |
| | * | | | Merge remote-tracking branch 'github/pr/1322'Johnathan Corgan2017-06-222-2/+2
| | |\ \ \ \
| | | * | | | sort input filesBernhard M. Wiedemann2017-06-052-2/+2
| | * | | | | Merge remote-tracking branch 'github/pr/1300'Johnathan Corgan2017-06-225-5/+146
| | |\ \ \ \ \
| | | * | | | | Address comment in pull requestRuben Undheim2017-05-141-2/+2
| | | * | | | | blocks: tag_gate (improvements)Ruben Undheim2017-04-265-4/+145
| | * | | | | | Merge branch 'maint'Johnathan Corgan2017-06-221-0/+45
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Merge remote-tracking branch 'github/pr/1339' into maintJohnathan Corgan2017-06-221-0/+45
| | | |\ \ \ \ \
| | | | * | | | | analog: add missing GRC file for fmdet_cf blockSean Nowlan2017-06-221-0/+45
| | | | | |_|_|/ | | | | |/| | |
* | | | | | | | Merge branch 'next' into python3Johnathan Corgan2017-06-228-44/+154
|\| | | | | | |
| * | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-06-229-52/+162
| |\| | | | | |
| | * | | | | | Merge branch 'maint'Johnathan Corgan2017-06-229-52/+162
| | |\| | | | | | | | |_|_|_|/ | | |/| | | |
| | | * | | | Merge remote-tracking branch 'github/pr/1335' into maintJohnathan Corgan2017-06-221-2/+2
| | | |\ \ \ \
| | | | * | | | gr-fec: specify 32bit int output when getting frozen bit indicesgnieboer2017-06-161-2/+2
| | | | |/ / /
| | | * | | | Merge remote-tracking branch 'github/pr/1334' into maintJohnathan Corgan2017-06-223-24/+31
| | | |\ \ \ \
| | | | * | | | gr_blocks: fix qa_file_metadata not calling close() on file sourcegnieboer2017-06-161-0/+2
| | | | * | | | gr-blocks: fix file_metadata_* not closing files on close()gnieboer2017-06-162-24/+29
| | | | |/ / /
| | | * | | | Merge remote-tracking branch 'github/pr/1325' into maintJohnathan Corgan2017-06-221-1/+1
| | | |\ \ \ \
| | | | * | | | uhd: Fixed error message for when multiple board options given are incorrectMartin Braun2017-06-071-1/+1
| | | | |/ / /
| | | * | | | Merge remote-tracking branch 'github/pr/1324' into maintJohnathan Corgan2017-06-221-1/+99
| | | |\ \ \ \
| | | | * | | | gr-blocks: fixed the broken example simple_copy.grc (the msg input port was n...Marc Lichtman2017-06-071-1/+99
| | | | |/ / /
| | | * | | | Merge remote-tracking branch 'github/pr/1332' into maintJohnathan Corgan2017-06-221-12/+16
| | | |\ \ \ \
| | | | * | | | gr-fft: Reuses file_lock object to prevent deadlocking on win32gnieboer2017-06-131-12/+12
| | | | * | | | gr-fft: Adds w32 specific headers to fft.ccgnieboer2017-06-131-0/+4
| | | | |/ / /