[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, 24 Jul 2015 21:31:54 +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 cac757717409c554e164b05540d069c5bebed91f
Merge: 8f99451 3a7f237
Author: Tom Rondeau <address@hidden>
Date: Fri Jul 24 17:26:48 2015 -0400
Merge branch 'master' into next
gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift | 3 ++-
gnuradio-runtime/lib/controlport/thrift/rpcserver_thrift.cc | 1 -
volk | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)