diff options
| author | Tom Rondeau | 2010-09-13 14:49:00 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2010-10-05 22:09:06 -0400 |
| commit | c1e6c53608175ffcce78a09baeba2c8aaa1a847d (patch) | |
| tree | 16bf56827fded1835804fe552621f5db2a0dbe87 /gr-qtgui/src | |
| parent | 38a5621196c440b28274c1a66d9a2e085f8817b1 (diff) | |
| download | gnuradio-c1e6c53608175ffcce78a09baeba2c8aaa1a847d.tar.gz gnuradio-c1e6c53608175ffcce78a09baeba2c8aaa1a847d.tar.bz2 gnuradio-c1e6c53608175ffcce78a09baeba2c8aaa1a847d.zip | |
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')
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 7a03e1978..1fd199e15 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -73,6 +73,7 @@ grinclude_HEADERS = \ qtgui_sink_c.h \ qtgui_sink_f.h +<<<<<<< HEAD QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB %.moc.cc : %.h |