diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-28 15:01:30 -0800 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-28 15:01:30 -0800 |
| commit | 12e279660e7300f42cbe993f89c8ad5ef6a3ea0a (patch) | |
| tree | 080b6fab83c1f8add762b0e01385bd0483a135a7 /gr-digital/examples/demod/ber_simulation.grc | |
| parent | e5929906700f3d6fa474fc5d9a8650b1fafbc2a1 (diff) | |
| parent | fbef82839ef85bfd7837f8534af2a3a74018930a (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/demod/digital_freq_lock.grc
gr-digital/examples/demod/pam_sync.grc
gr-digital/examples/demod/pam_timing.grc
gr-utils/src/python/CMakeLists.txt
Diffstat (limited to 'gr-digital/examples/demod/ber_simulation.grc')
| -rw-r--r-- | gr-digital/examples/demod/ber_simulation.grc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc index 3097aa8fa5..2a3e27a496 100644 --- a/gr-digital/examples/demod/ber_simulation.grc +++ b/gr-digital/examples/demod/ber_simulation.grc @@ -5,7 +5,7 @@ <key>options</key> <param> <key>id</key> - <value>ber_sim</value> + <value>ber_simulation</value> </param> <param> <key>_enabled</key> |