diff options
| author | Johnathan Corgan | 2010-10-06 12:34:14 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-10-06 12:35:08 -0700 |
| commit | 125433fe84507cc84e585c1e06bb804fdb2ce043 (patch) | |
| tree | 5ba225ddbf1dd062b1ea5e8dfa2a04d6b995e4cf /gr-qtgui/src/lib/.gitignore | |
| parent | 2652a20330ea1238d561ce799c40833e46d3508c (diff) | |
| parent | 2723c3fb2a22872bba1c72bab1d0c4e74ffda86f (diff) | |
| download | gnuradio-125433fe84507cc84e585c1e06bb804fdb2ce043.tar.gz gnuradio-125433fe84507cc84e585c1e06bb804fdb2ce043.tar.bz2 gnuradio-125433fe84507cc84e585c1e06bb804fdb2ce043.zip | |
Merge branch 'maint'
* maint:
Fixed setting of USB_LIBS for *win*
Fix so that non-Darwin OSs use USB_LIBS correctly for linking
New way of checking for various LIBUSB names; for legacy version, make sure the symbol 'usb_debug' exists (so-as to not use the 'compat' version).
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-qtgui/src/lib/.gitignore')
| -rw-r--r-- | gr-qtgui/src/lib/.gitignore | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gr-qtgui/src/lib/.gitignore b/gr-qtgui/src/lib/.gitignore index 58c8081e5..11bb4342a 100644 --- a/gr-qtgui/src/lib/.gitignore +++ b/gr-qtgui/src/lib/.gitignore @@ -4,10 +4,10 @@ /.deps /qtgui.cc /qtgui.py -/WaterfallDisplayPlot_moc.cc -/Waterfall3DDisplayPlot_moc.cc -/TimeDomainDisplayPlot_moc.cc -/spectrumdisplayform_moc.cc -/spectrumdisplayform_ui.h -/FrequencyDisplayPlot_moc.cc -/ConstellationDisplayPlot_moc.cc +/WaterfallDisplayPlot.moc.cc +/Waterfall3DDisplayPlot.moc.cc +/TimeDomainDisplayPlot.moc.cc +/spectrumdisplayform.moc.cc +/spectrumdisplayform.ui.h +/FrequencyDisplayPlot.moc.cc +/ConstellationDisplayPlot.moc.cc |