From: Tom Rondeau <trondeau@vt.edu>
Date: Mon, 13 Sep 2010 18:49:00 +0000 (-0400)
Subject: Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=c1e6c53608175ffcce78a09baeba2c8aaa1a847d;p=debian%2Fgnuradio

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.
---

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