Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and...

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 7a03e1978b1fea37cf1538a3705804719d5af0b3..1fd199e154eff5be88a75310558a0a59afdadf33 100644 (file)
--- 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