[Commit-gnuradio] [gnuradio] 04/04: Merge branch 'maint'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit d1c13af7d885220e8245674f789a080d95516521
Merge: ebb2af6 a6c837e
Author: Tom Rondeau <address@hidden>
Date:   Wed Jul 2 18:11:19 2014 -0400

    Merge branch 'maint'

 .../python/digital/constellation_map_generator.py  | 14 ++++++------
 gr-digital/python/digital/psk_constellations.py    | 25 +++++++++++-----------
 gr-digital/python/digital/qam_constellations.py    | 24 ++++++++++-----------
 3 files changed, 32 insertions(+), 31 deletions(-)