[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: |
Fri, 4 Jul 2014 00:03:48 +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 c719858f3de8826b2d4bfc63c04150caa9ec5896
Merge: d8b5bb5 085c35a
Author: Tom Rondeau <address@hidden>
Date: Thu Jul 3 20:02:33 2014 -0400
Merge branch 'master' into next
cmake/Modules/GrTest.cmake | 2 +-
volk/CMakeLists.txt | 7 ++++++-
volk/lib/volk_rank_archs.c | 7 +++++++
3 files changed, 14 insertions(+), 2 deletions(-)