[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: |
Wed, 12 Apr 2017 15:53:27 +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 c10208b11b4c5af9223f335bccb20bd809010ca8
Merge: f657307 c72b23d
Author: Johnathan Corgan <address@hidden>
Date: Wed Apr 12 08:47:09 2017 -0700
Merge branch 'master' into next
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc CMakeLists.txt
index b16ad0d,e12334c..72dbe86
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -431,8 -471,9 +431,8 @@@ find_package(Log4cpp
# Distribute the README file
########################################################################
install(
- FILES README README.hacking
+ FILES README.md README.hacking
DESTINATION ${GR_PKG_DOC_DIR}
- COMPONENT "docs"
)
########################################################################