summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qwt4'Tom Rondeau2011-03-266-20/+89
|\
| * gr-qtgui: adding QA code for qtgui; remarked out until a fix for the segfault...Tom Rondeau2011-03-265-8/+77
| * gr-qtgui: more robust way of checking for QWT-qt4; checks a different header ...Tom Rondeau2011-03-261-12/+12
* | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2011-03-263-319/+540
|\|
| * Merge branch 'filtdesign'Tom Rondeau2011-03-253-319/+540
| |\
| | * gr-utils: more error checking on filter designer.Tom Rondeau2011-03-251-34/+65
| | * gr-utils: adding save/open capabilities to equiripple filters. Also added som...Tom Rondeau2011-03-251-21/+60
| | * gr-utils: handling parameters and GUI updates when loading filters from file....Tom Rondeau2011-03-181-46/+98
| | * gr-utils: refactoring design parameters from 'design' to 'params' to not conf...Tom Rondeau2011-03-171-25/+25
| | * gr-utils: way to break something you just fixed a few days ago...Tom Rondeau2011-03-171-1/+1
| | * gr-utils: Adding save and open actions to filter designer.Tom Rondeau2011-03-173-286/+385
* | | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2011-03-2517-25/+33
|\| |
| * | Fixing missing include files and various other patches for Windows build issues.Don Ward2011-03-2515-13/+28
| * | audio: moved audio docs to gr-audio and fix commentsJosh Blum2011-03-222-12/+5
| |/
* | Merge branch 'master' of gnuradio.org:gnuradioTom Rondeau2011-03-20899-12875/+43476
|\|
| * howto: updated ignoresJohnathan Corgan2011-03-162-0/+2
| * build: updated version to 3.4.0gitv3.4.0gitJohnathan Corgan2011-03-162-4/+4
| * Merge remote branch 'gnuradio/next'Johnathan Corgan2011-03-16896-12875/+43470
| |\
| | * gruel: added missing ignoresJohnathan Corgan2011-03-152-0/+4
| | * Merge branch 'next' of gnuradio.org:gnuradio into nextTom Rondeau2011-03-15231-5955/+2455
| | |\
| | | * qtgui: fix distcheck errorJohnathan Corgan2011-03-141-0/+1
| | | * Merge remote branch 'jblum/mergeme/qtgui/grc' into nextJohnathan Corgan2011-03-1449-484/+1217
| | | |\
| | | | * Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grcJosh Blum2011-03-1449-484/+1217
| | | | |\
| | | | | * qtgui: removed python directory that was added, never usedJosh Blum2011-03-122-31/+0
| | | | | * qtgui-grc: added suport in main template for theme iconJosh Blum2011-03-071-1/+2
| | | | | * qtgui-grc: minor tweaks to the various thingsJosh Blum2011-03-077-16/+31
| | | | | * qtgui-grc: added read-only thermo widget to range blockJosh Blum2011-03-071-12/+28
| | | | | * qtgui-grc: fix for list option working in chooser blockJosh Blum2011-03-071-3/+3
| | | | | * qtgui-grc: added check for pyqwt in configJosh Blum2011-03-072-8/+5
| | | | | * grc: added function args to probe block and documentationJosh Blum2011-03-075-5/+29
| | | | | * grc: rework the probe blocks and how they fit into grcJosh Blum2011-03-0613-380/+92
| | | | | * qtgui-grc: moved slider to range, added knob and gui tweaksJosh Blum2011-03-053-127/+186
| | | | | * qtgui-grc: use a vboxlayout for the top_layoutJosh Blum2011-03-041-1/+1
| | | | | * qtgui-grc: made slider widget components (counter/slider) optionalJosh Blum2011-03-031-4/+22
| | | | | * qtgui-grc: add engineering notation to entry and label + other tweaksJosh Blum2011-03-024-17/+19
| | | | | * qtgui-grc: enable start/stop control through qt widgetsJosh Blum2011-03-012-1/+3
| | | | | * qtgui-grc: rename the text entry and label blocksJosh Blum2011-03-013-10/+10
| | | | | * grc-qtgui: creaded check box widget with qtgui, cleanup label codeJosh Blum2011-03-016-21/+99
| | | | | * grc-qtgui: added variable text box and static text widgetsJosh Blum2011-03-015-5/+138
| | | | | * grc-qtgui: pick correct signal overload for variable chooserJosh Blum2011-03-011-5/+3
| | | | | * grc-qtgui: added radio button support, tweaks, more optionsJosh Blum2011-03-011-25/+107
| | | | | * grc-qtgui: work on variable chooser blockJosh Blum2011-03-012-17/+108
| | | | | * grc: work on generator for gui flowgraphs to simplify generationJosh Blum2011-03-0123-72/+42
| | | | | * grc: moved wxgui blocks and python into gr-wxgui/grcJosh Blum2011-03-0123-37/+66
| | | | | * qtgui: work on variable chooserJosh Blum2011-03-014-2/+87
| | | | | * grc: added tabbed widget in qtgui for grcJosh Blum2011-03-0110-22/+161
| | | | | * qtgui: use pyqwt widgets in grc variable slider blockJosh Blum2011-03-016-370/+28
| | | | | * qtgui: created a forms module with a slider and text box, implemented in grcJosh Blum2011-03-0115-98/+336
| | | | | * qtgui: an attempt at a slider formJosh Blum2011-03-014-0/+275
| | | | | * grc: added qtgui support to grc (just added sink)Josh Blum2011-03-015-0/+142