[Commit-gnuradio] [gnuradio] 05/06: Merge branch 'maint'

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 056ce0f3db5050f77eef56f0ec1bcb79e1547239
Merge: ddb1e77 dec480a
Author: Johnathan Corgan <address@hidden>
Date:   Tue Dec 29 07:27:31 2015 -0800

    Merge branch 'maint'

 cmake/Modules/GrPlatform.cmake                                   | 6 +++---
 gr-utils/python/modtool/gr-newmod/cmake/Modules/GrPlatform.cmake | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)