[Commit-gnuradio] [gnuradio] 23/25: Merge remote-tracking branch 'mbr0wn/modtool/versioning'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 7b9343b6e5bf119f57dc78104b7988fee4cd9d84
Merge: 49f4bfb 2325a7d
Author: Johnathan Corgan <address@hidden>
Date:   Fri May 27 11:32:09 2016 -0700

    Merge remote-tracking branch 'mbr0wn/modtool/versioning'

 gr-utils/python/modtool/gr-newmod/CMakeLists.txt     |  9 ++++++++-
 gr-utils/python/modtool/gr-newmod/lib/CMakeLists.txt | 16 ++++++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)