[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint'
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/03: Merge branch 'maint' |
|
Date: |
Fri, 27 Jun 2014 13:30:50 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
trondeau pushed a commit to branch master
in repository gnuradio.
commit f985fbaedcc116fb83224c1d962e309bf28f0af3
Merge: df86953 df8bd0b
Author: Tom Rondeau <address@hidden>
Date: Fri Jun 27 09:10:01 2014 -0400
Merge branch 'maint'
gr-audio/lib/osx/osx_common.h | 12 ++++++------
gr-audio/lib/osx/osx_source.cc | 6 ++----
volk/lib/CMakeLists.txt | 16 ++++++++++++++++
3 files changed, 24 insertions(+), 10 deletions(-)