[Commit-gnuradio] [gnuradio] 11/17: 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 4745c74ad22da763bb8ed5775bc14276c705f15c
Merge: 7d09110 3d9ccb4
Author: Johnathan Corgan <address@hidden>
Date:   Mon Aug 1 13:17:16 2016 -0700

    Merge branch 'maint'

 CMakeLists.txt                                     |  4 ++--
 cmake/Modules/GrVersion.cmake                      | 21 ++++++++++++++-------
 gnuradio-runtime/lib/prefs.cc                      |  3 ++-
 gr-dtv/lib/dvbt/dvbt_bit_inner_interleaver_impl.cc |  5 +++--
 4 files changed, 21 insertions(+), 12 deletions(-)