[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 21:43:05 +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 405afdbde9cc1a794e10e89673afc05ae2d8e9b3
Merge: 10a7c79 73f138e
Author: Johnathan Corgan <address@hidden>
Date: Mon Apr 21 14:41:20 2014 -0700
Merge branch 'master' into next
docs/doxygen/other/main_page.dox | 4 ++--
gr-vocoder/include/gnuradio/vocoder/codec2_encode_sp.h | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)