From: Tom Rondeau <trondeau@vt.edu>
Date: Fri, 17 Sep 2010 15:54:32 +0000 (-0400)
Subject: Finally, the simple fix for the qtgui issues; also, changed the naming scheme output... 
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=f18025c099e4f69829dc4fc1732a4a9e83b3eb1d;p=debian%2Fgnuradio

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

diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am
index 1fd199e1..4ba637ad 100644
--- a/gr-qtgui/src/lib/Makefile.am
+++ b/gr-qtgui/src/lib/Makefile.am
@@ -73,8 +73,6 @@ 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
 	$(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@