[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: Merge remote-tracking branch 'ncorga
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: Merge remote-tracking branch 'ncorgan/master_win_compat' |
|
Date: |
Fri, 7 Mar 2014 19:15:42 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 0bb63c7420e31fbb91b94df473d3c046260a1fcc
Merge: f08f0f2 1e0c15b
Author: Johnathan Corgan <address@hidden>
Date: Fri Mar 7 10:54:54 2014 -0800
Merge remote-tracking branch 'ncorgan/master_win_compat'
CMakeLists.txt | 26 +++++++++++++++++++++-----
volk/lib/CMakeLists.txt | 19 ++++++++++++++++---
volk/lib/volk_malloc.c | 4 ++++
3 files changed, 41 insertions(+), 8 deletions(-)