[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, 11 Apr 2016 03:19:41 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
nwest pushed a commit to branch next
in repository gnuradio.
commit d2b7fc8db4b98bc5f86d74b8e73ef73f0f90c56b
Merge: 98749f5 277b294
Author: Nathan West <address@hidden>
Date: Sun Apr 10 23:09:43 2016 -0400
Merge branch 'master' into next
Conflicts:
docs/RELEASE-NOTES-3.7.9.2.md
RELEASE-NOTES.md | 11 ++++++-----
RELEASE-NOTES.md => docs/RELEASE-NOTES-3.7.9.2.md | 11 ++++++-----
2 files changed, 12 insertions(+), 10 deletions(-)