Changeset 8267

Timestamp:

04/24/08 00:17:04

Author:

jcorgan

Message:

Applied changeset r8192:8194 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am (modified) (3 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i (modified) (3 diffs)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_cpfsk_bc.cc (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/general/gr_cpfsk_bc.cc)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_cpfsk_bc.h (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/general/gr_cpfsk_bc.h)
• gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_cpfsk_bc.i (copied) (copied from gnuradio/trunk/gnuradio-core/src/lib/general/gr_cpfsk_bc.i)

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am

@@ -56 +56 @@
-        gr_costas_loop_cc.cc            \
-        gr_count_bits.cc                \
+        gr_cpfsk_bc.cc                  \
-        gr_crc32.cc                     \
-        gr_ctcss_squelch_ff.cc          \
@@ -186 +187 @@
-        gr_costas_loop_cc.h             \
-        gr_count_bits.h                 \
-
+
+
-        gr_ctcss_squelch_ff.h           \
-        gr_dd_mpsk_sync_cc.h            \
@@ -329 +331 @@
-        gr_correlate_access_code_bb.i   \
-        gr_costas_loop_cc.i             \
+        gr_cpfsk_bc.i                   \
-        gr_crc32.i                      \
-        gr_ctcss_squelch_ff.i           \

gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/general.i

@@ -1 +1 @@
-/* -*- c++ -*- */
-/*
-
+,2008
- * 
- * This file is part of GNU Radio
@@ -121 +121 @@
-#include <gr_peak_detector2_fb.h>
-#include <gr_repeat.h>
+#include <gr_cpfsk_bc.h>
-%}
-
@@ -221 +222 @@
-%include "gr_peak_detector2_fb.i"
-%include "gr_repeat.i"
+%include "gr_cpfsk_bc.i"