From c1e6c53608175ffcce78a09baeba2c8aaa1a847d Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 13 Sep 2010 14:49:00 -0400 Subject: [PATCH] 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. --- gr-qtgui/src/lib/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 7a03e197..1fd199e1 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 -- 2.30.2