Merge commit 'origin/HEAD'

Conflicts:

	gsm-tvoid/src/lib/gsm.i
	gsm-tvoid/src/lib/gsm_burst.cc
	gsm-tvoid/src/lib/gsm_burst.h
	gsm-tvoid/src/lib/gsm_burst_cf.cc
	gsm-tvoid/src/lib/gsm_burst_ff.cc
	gsm-tvoid/src/lib/gsm_burst_ff.h
	gsm-tvoid/src/python/gsm_scan.py

1 files changed, 1 insertions, 1 deletions

diff --git a/gsm-tvoid/src/python/gsm_scan.py b/gsm-tvoid/src/python/gsm_scan.py
index b98bf43..6d25fd3 100755
--- a/gsm-tvoid/src/python/gsm_scan.py
+++ b/gsm-tvoid/src/python/gsm_scan.py
@@ -429,7 +429,6 @@ class app_flow_graph(stdgui.gui_flow_graph):
 			popts |= gsm.PRINT_GSM_DECODE
 		
 		#TODO: should warn if PRINT_GSM_DECODE is combined with other flags (will corrupt output for gsmdecode)
-		
 		self.burst.d_print_options = popts	
 		
 
@@ -586,6 +585,7 @@ class app_flow_graph(stdgui.gui_flow_graph):
 
 	def on_idle(self, event):
 		#We can't update this while in the tune functions since they can be invoked by callbaks and the GUI croaks...
+		#FIXME: This is icky.
 		self._set_status_msg(self.status_msg)
 		#print "Idle.\n";