[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/02: Merge branch 'master' into next |
|
Date: |
Mon, 7 Sep 2015 23:55:21 +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 f3f608ef5f227b1bd92d883a17337e76c5894911
Merge: ebdd29c 25cc238
Author: Johnathan Corgan <address@hidden>
Date: Mon Sep 7 16:44:38 2015 -0700
Merge branch 'master' into next
Conflicts:
gr-uhd/grc/gen_uhd_usrp_blocks.py
gr-dtv/examples/README.dvbt | 7 +
gr-dtv/examples/dvbt_rx_8k.grc | 2903 +++++++++++++++++++++++++++++++++++++
gr-uhd/grc/gen_uhd_usrp_blocks.py | 7 +-
volk | 2 +-
4 files changed, 2915 insertions(+), 4 deletions(-)
diff --cc volk
index 52f2192,52f2192..4a25f2e
--- a/volk
+++ b/volk
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 52f219294c2424b541739b28dd7296196067dba9
++Subproject commit 4a25f2ea6db33e3269ab485341c65d653712835a