summaryrefslogtreecommitdiff
path: root/gr-noaa
diff options
context:
space:
mode:
authorJohnathan Corgan2010-10-06 12:20:08 -0700
committerJohnathan Corgan2010-10-06 12:20:08 -0700
commit2723c3fb2a22872bba1c72bab1d0c4e74ffda86f (patch)
treec1a6c2564c15464b8c1275620c520482f9b5ac9c /gr-noaa
parent916b205660aa676e1587411b48f24b6d5d3c0de2 (diff)
parentf18025c099e4f69829dc4fc1732a4a9e83b3eb1d (diff)
downloadgnuradio-2723c3fb2a22872bba1c72bab1d0c4e74ffda86f.tar.gz
gnuradio-2723c3fb2a22872bba1c72bab1d0c4e74ffda86f.tar.bz2
gnuradio-2723c3fb2a22872bba1c72bab1d0c4e74ffda86f.zip
Merge remote branch 'tom/qtfix' into maint
* tom/qtfix: Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner. Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API. Fixed gitignore to reflect changes in moc/ui file naming. Fixes a lot of warnings by cleaning up namespace issues. Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner. Removing qwtplot3d dependency and fixing a missed include in waterfallGlobalData.h. Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API.
Diffstat (limited to 'gr-noaa')
0 files changed, 0 insertions, 0 deletions