[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'gnurad
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge remote-tracking branch 'gnuradio-github/pr/1127' |
|
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 master
in repository gnuradio.
commit c4d4e34dfc3d94ebd8c7b7e9c9872f394f46f808
Merge: 1d477a7 579c117
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 3 09:32:53 2017 -0700
Merge remote-tracking branch 'gnuradio-github/pr/1127'
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(-)