[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: |
Thu, 19 Feb 2015 22:30:47 +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 514850b2ff1d8ff26207749888d53101a78bbc81
Merge: 20b26f4 521dac2
Author: Johnathan Corgan <address@hidden>
Date: Thu Feb 19 14:02:58 2015 -0800
Merge branch 'master' into next
cmake/Modules/GrPython.cmake | 3 +--
gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPython.cmake | 3 +--
gr-wxgui/grc/top_block_gui.py | 1 +
volk/cmake/GrPython.cmake | 2 +-
4 files changed, 4 insertions(+), 5 deletions(-)