[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, 7 Mar 2014 19:15:43 +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 41ce76d68c24260b69b06086ff8068555759835e
Merge: e953b7d 5ab2370
Author: Johnathan Corgan <address@hidden>
Date: Fri Mar 7 10:55:07 2014 -0800
Merge branch 'master' into next
CMakeLists.txt | 26 +++++++++++++++++++++-----
gr-wxgui/grc/CMakeLists.txt | 4 ++--
volk/lib/CMakeLists.txt | 19 ++++++++++++++++---
volk/lib/volk_malloc.c | 4 ++++
4 files changed, 43 insertions(+), 10 deletions(-)