[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 03/05: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 03/05: Merge branch 'master' into next |
|
Date: |
Thu, 8 Sep 2016 21:46:02 +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 60c1c7b3a222a98c51db219a04861bbfd120f10a
Merge: 50dc314 4ecc974
Author: Johnathan Corgan <address@hidden>
Date: Thu Sep 8 14:26:52 2016 -0700
Merge branch 'master' into next
gr-digital/grc/digital_block_tree.xml | 1 -
gr-digital/grc/digital_correlate_and_sync_cc.xml | 1 +
gr-digital/include/gnuradio/digital/correlate_and_sync_cc.h | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)