[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'next' into next-qt5 |
|
Date: |
Fri, 8 Apr 2016 16:06:34 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next-qt5
in repository gnuradio.
commit a3f1ecf1d31f9ea8a452700a7bca047135e73ad7
Merge: 252b207 2af7eda
Author: Johnathan Corgan <address@hidden>
Date: Fri Apr 8 09:04:08 2016 -0700
Merge branch 'next' into next-qt5
gnuradio-runtime/lib/tpb_thread_body.cc | 4 ++--
gr-digital/lib/burst_shaper_XX_impl.cc.t | 38 +++++++++++++++++++++++++++-----
2 files changed, 34 insertions(+), 8 deletions(-)