Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grc

Conflicts:
	grc/grc_gnuradio/Makefile.am

1 files changed, 3 insertions, 16 deletions

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 9b5bda298..6f7802169 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -58,7 +58,6 @@ dist_ourdata_DATA = \
 	blks2_tcp_sink.xml \
 	blks2_tcp_source.xml \
 	blks2_valve.xml \
-	blks2_variable_sink_x.xml \
 	blks2_wfm_rcv.xml \
 	blks2_wfm_rcv_pll.xml \
 	blks2_wfm_tx.xml \
@@ -156,6 +155,7 @@ dist_ourdata_DATA = \
 	gr_probe_avg_mag_sqrd_x.xml \
 	gr_probe_density_b.xml \
 	gr_probe_mpsk_snr_c.xml \
+	gr_probe_signal_f.xml \
 	gr_pwr_squelch_xx.xml \
 	gr_quadrature_demod_cf.xml \
 	gr_rational_resampler_base_xxx.xml \
@@ -195,12 +195,10 @@ dist_ourdata_DATA = \
 	import.xml \
 	low_pass_filter.xml \
 	note.xml \
-	notebook.xml \
 	options.xml \
 	pad_sink.xml \
 	pad_source.xml \
 	parameter.xml \
-	probe_function.xml \
 	random_source_x.xml \
 	root_raised_cosine_filter.xml \
 	trellis_encoder_xx.xml \
@@ -211,20 +209,9 @@ dist_ourdata_DATA = \
 	trellis_viterbi_combined_xx.xml \
 	trellis_viterbi_x.xml \
 	variable.xml \
-	variable_check_box.xml \
-	variable_chooser.xml \
 	variable_config.xml \
-	variable_slider.xml \
-	variable_static_text.xml \
-	variable_text_box.xml \
+	variable_function_probe.xml \
 	virtual_sink.xml \
 	virtual_source.xml \
-	wxgui_constellationsink2.xml \
-	wxgui_fftsink2.xml \
-	wxgui_histosink2.xml \
-	wxgui_numbersink2.xml \
-	wxgui_scopesink2.xml \
-	wxgui_termsink.xml \
-	wxgui_waterfallsink2.xml \
 	xmlrpc_client.xml \
 	xmlrpc_server.xml