[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: |
Mon, 21 Apr 2014 22:35:46 +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 ec186a30b899e9ea1be363dace02b0ae6733ab42
Merge: b88e180 d947f35
Author: Tom Rondeau <address@hidden>
Date: Mon Apr 21 18:35:34 2014 -0400
Merge branch 'master' into next
docs/doxygen/other/ctrlport.dox | 12 ++++++------
gr-vocoder/doc/vocoder.dox | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)