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, 0 insertions, 1 deletions

diff --git a/gsm-tvoid/src/lib/gsm.i b/gsm-tvoid/src/lib/gsm.i
index 30981f2..106e378 100755
--- a/gsm-tvoid/src/lib/gsm.i
+++ b/gsm-tvoid/src/lib/gsm.i
@@ -87,7 +87,6 @@ public:
 	//Methods
 	void full_reset(void);
 
-
 protected:
 	gsm_burst(gr_feval_ll *);  
 };