[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'balist
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 04/05: Merge remote-tracking branch 'balister/small-fixes' into maint |
|
Date: |
Fri, 28 Oct 2016 18:55:45 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 7d80de84057817d0134699b6893efd19717ed1ab
Merge: a4514d5 b12424b
Author: Johnathan Corgan <address@hidden>
Date: Fri Oct 28 10:46:06 2016 -0700
Merge remote-tracking branch 'balister/small-fixes' into maint
cmake/Modules/GrPlatform.cmake | 8 ++++++++
gnuradio-runtime/python/gnuradio/ctrlport/gr-perf-monitorx | 2 +-
gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake | 8 ++++++++
3 files changed, 17 insertions(+), 1 deletion(-)