[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 21:58:36 +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 4bd4fe3c802bb3e512fc3e0e277d5e2b20ce0deb
Merge: bd78126 8b3abcc
Author: Johnathan Corgan <address@hidden>
Date: Wed Jun 17 14:50:02 2015 -0700
Merge branch 'master' into next
gnuradio-runtime/include/gnuradio/thrift_application_base.h | 4 ++--
gnuradio-runtime/lib/CMakeLists.txt | 7 ++++++-
grc/python/Generator.py | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)