[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 03:39: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 f4176cbe97fab83902704d4ca887ccb266fd8878
Merge: 185b50f 885cc64
Author: Tom Rondeau <address@hidden>
Date: Fri Jul 25 23:39:04 2014 -0400
Merge branch 'master' into next
docs/doxygen/other/build_guide.dox | 162 +++++++
docs/doxygen/other/components.dox | 34 ++
docs/doxygen/other/extra_pages.dox | 320 -------------
docs/doxygen/other/main_page.dox | 503 +--------------------
docs/doxygen/other/metadata.dox | 15 +-
docs/doxygen/other/msg_passing.dox | 5 +
docs/doxygen/other/oot_config.dox | 78 ++++
.../other/{main_page.dox => operating_fg.dox} | 234 +---------
docs/doxygen/other/prefs.dox | 87 ++++
docs/doxygen/other/python_blocks.dox | 154 +++++++
docs/doxygen/other/usage.dox | 43 ++
docs/doxygen/other/volk_guide.dox | 152 +++++++
docs/exploring-gnuradio/exploring_gnuradio.dox | 8 +-
gr-zeromq/docs/zeromq.dox | 22 +
14 files changed, 767 insertions(+), 1050 deletions(-)