[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, 30 Jul 2014 18:27:58 +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 027ace9934e30b487f437050c1d968e8a6c6b0ae
Merge: a4103e0 2017526
Author: Tom Rondeau <address@hidden>
Date: Wed Jul 30 14:27:36 2014 -0400
Merge branch 'master' into next
docs/doxygen/other/build_guide.dox | 1 -
volk/apps/volk_profile.cc | 4 +--
volk/lib/CMakeLists.txt | 56 ++++++++++++++++++--------------------
3 files changed, 29 insertions(+), 32 deletions(-)