[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: |
Wed, 17 Jun 2015 19:13:50 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch next
in repository gnuradio.
commit c4120b4ccbf90276d12d631415e2476696ee7817
Merge: fcfc210 861b15f
Author: Tom Rondeau <address@hidden>
Date: Wed Jun 17 15:09:16 2015 -0400
Merge branch 'master' into next
gnuradio-runtime/lib/CMakeLists.txt | 1 +
gr-digital/lib/correlate_and_sync_cc_impl.cc | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)