summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* digital: Delete deprecated OFDM blocks and related examplesMartin Braun2016-11-1516-1811/+0
* Merge branch 'master' into nextJohnathan Corgan2016-11-1517-100/+122
|\
| * digital: add deprecation warnings to appropriate OFDM blocksJohnathan Corgan2016-11-155-100/+110
| * Merge remote-tracking branch 'mbr0wn/deprecate_ofdm_master'Johnathan Corgan2016-11-1512-0/+12
| |\
| | * digital: Mark deprecated OFDM blocks as suchMartin Braun2016-11-1412-0/+12
* | | Merge remote-tracking branch 'github/remove-mpsk-receiver' into nextJohnathan Corgan2016-11-1514-1773/+0
|\ \ \
| * | | digital: remove deprecated mpsk_receiver blockJohnathan Corgan2016-11-1214-1773/+0
| * | | Merge branch 'deprecate-mpsk-receiver' into remove-mpsk-receiverJohnathan Corgan2016-11-121-0/+2
| |\ \ \
* | \ \ \ Merge branch 'master' into nextJohnathan Corgan2016-11-151-0/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Merge remote-tracking branch 'github/deprecate-mpsk-receiver'Johnathan Corgan2016-11-151-0/+2
| |\| | | | |/ | |/|
| | * digital: add constructor warning for deprecated mpsk_receiver_ccJohnathan Corgan2016-11-121-0/+2
* | | Merge branch 'master' into nextJohnathan Corgan2016-11-123-5/+11
|\| |
| * | Merge branch 'maint'Johnathan Corgan2016-11-123-5/+11
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'sbmueller/dpi_fix' into maintJohnathan Corgan2016-11-123-5/+11
| | |\
| | | * grc: fix column widths on dpi scalings != 1Sebastian Müller2016-11-023-5/+11
* | | | Merge branch 'master' into nextJohnathan Corgan2016-11-127-16/+28
|\| | |
| * | | Merge branch 'maint'Johnathan Corgan2016-11-127-16/+28
| |\| |
| | * | Merge remote-tracking branch 'skoslowski/fix_1089' into maintJohnathan Corgan2016-11-122-2/+3
| | |\ \
| | | * | grc: fix initial setting of generate mode (issue #1089)Sebastian Koslowski2016-11-121-1/+2
| | | * | grc: (minor) remove deprecated use of empty format_specSebastian Koslowski2016-11-121-1/+1
| | * | | Merge remote-tracking branch 'skoslowski/dpi_fix' into maintJohnathan Corgan2016-11-126-14/+25
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * grc: respect display scaling for block positions, canvas size and props dialogSebastian Koslowski2016-10-266-14/+25
* | | | Merge remote-tracking branch 'bastibl/qt-style-sheets' into nextJohnathan Corgan2016-11-111-1/+1
|\ \ \ \
| * | | | qtgui: fix stylesheet for qt5Bastian Bloessl2016-11-111-1/+1
* | | | | Merge remote-tracking branch 'bastibl/cmake-qwt-fix' into nextJohnathan Corgan2016-11-111-1/+1
|\ \ \ \ \
| * | | | | cmake: qwt prefere correct versionBastian Bloessl2016-11-111-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'balister/fix-f24' into nextJohnathan Corgan2016-11-111-0/+1
|\ \ \ \ \
| * | | | | FindQwt.cmake: Add search path from Qwt5 on Fedora 24.Philip Balister2016-11-101-0/+1
| |/ / / /
* | | | | Merge branch 'master' into nextJohnathan Corgan2016-11-116-12/+26
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'maint'Johnathan Corgan2016-11-116-12/+26
| |\| |
| | * | Add config check for Xrand48() functionsPaul Cercueil2016-11-114-5/+21
| | * | CMake: Fix math macros not available on MinGWPaul Cercueil2016-11-112-1/+4
| | * | CMake: GrBoost: Remove old workaroundPaul Cercueil2016-11-111-6/+1
* | | | Merge branch 'master' into nextJohnathan Corgan2016-11-042-0/+27
|\| | |
| * | | Merge remote-tracking branch 'josh/gr_snaps'Johnathan Corgan2016-11-041-0/+19
| |\ \ \
| | * | | runtime: support dynamically located gnuradio installsJosh Blum2016-11-041-0/+19
| * | | | Merge branch 'maint'Johnathan Corgan2016-11-041-0/+8
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | msk_timing_recovery_cc: ignore (and warn) on time_est outside of (-1.0,Nick Foster2016-11-041-0/+8
* | | | Merge branch 'master' into nextJohnathan Corgan2016-10-2814-417/+664
|\| | |
| * | | Merge remote-tracking branch 'michaelld/split_digital_swig'Johnathan Corgan2016-10-2810-419/+641
| |\ \ \
| | * | | trellis: split swig into 2 parts (a la blocks/swig) to allow for building on ...Michael Dickens2016-10-264-120/+207
| | * | | trellis: swig: rename file in preparation for splitting, to keep history.Michael Dickens2016-10-261-0/+0
| | * | | digital: split swig into 3 parts (a la blocks/swig) to allow for building on ...Michael Dickens2016-10-245-178/+313
| | * | | digital: swig: rename file in preparation for splitting, to keep history.Michael Dickens2016-10-241-0/+0
| * | | | Merge branch 'maint'Johnathan Corgan2016-10-284-2/+28
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | pmt.cc: Adding mutex for thread-safety to handle simultaneous pmt_symbol inse...Darek Kawamoto2016-10-281-1/+11
| | * | | Merge remote-tracking branch 'balister/small-fixes' into maintJohnathan Corgan2016-10-283-1/+17
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Sync modtool GrPlatform.cmake with main GNURadio version.Philip Balister2016-10-251-0/+8
| | | * | Use CMAKE_INSTALL_LIBDIR to set LIB_SUFFIX.Philip Balister2016-10-251-0/+8
| | | * | gr-perf-monitorx: Remove unused PyQwt import.Philip Balister2016-10-251-1/+1