[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: |
Sat, 26 Jul 2014 16:21:21 +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 0e8bd9c1d3fcdd54c79afbe6ab01814d514062c7
Merge: f4176cb fd0db71
Author: Tom Rondeau <address@hidden>
Date: Sat Jul 26 12:21:05 2014 -0400
Merge branch 'master' into next
cmake/Modules/GrBuildTypes.cmake | 2 +-
docs/doxygen/Doxyfile.in | 2 +-
docs/doxygen/other/build_guide.dox | 19 +++++++-----
.../include/gnuradio/blocks/multiply_matrix_XX.h.t | 23 +++++++++-----
gr-qtgui/lib/number_sink_impl.cc | 36 ++++++++++++++++------
5 files changed, 56 insertions(+), 26 deletions(-)