[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, 17 Jun 2015 19:37:07 +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 bd7812694f7f73b9530f448736e7b1bcc9ac5344
Merge: c4120b4 7b684a2
Author: Tom Rondeau <address@hidden>
Date: Wed Jun 17 15:32:30 2015 -0400
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/thrift_application_base.h | 4 ++--
gnuradio-runtime/lib/controlport/thrift/rpcserver_booter_thrift.cc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)