[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Mon, 3 Apr 2017 16:39:15 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit e24b3a8a8d6534a0c922aec7ac3d494ccc1773fa
Merge: b67e493 c4d4e34
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 3 09:33:04 2017 -0700
Merge branch 'master' into next
gr-digital/grc/digital_costas_loop_cc.xml | 10 +++++
gr-digital/lib/costas_loop_cc_impl.cc | 66 ++++++++++++-------------------
2 files changed, 36 insertions(+), 40 deletions(-)