[Commit-gnuradio] [gnuradio] 10/16: Merge remote-tracking branch 'gnuradio-wg-grc/grc_config_xterm'

[git]

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

trondeau pushed a commit to branch master
in repository gnuradio.

commit f657c617bb761e08ed77302c29fdee29525214a8
Merge: d0b8808 e9ff542
Author: Tom Rondeau <address@hidden>
Date:   Sun Feb 16 11:35:03 2014 -0500

    Merge remote-tracking branch 'gnuradio-wg-grc/grc_config_xterm'

 grc/grc.conf.in         | 1 +
 grc/python/Constants.py | 3 +++
 grc/python/Generator.py | 6 +++---
 3 files changed, 7 insertions(+), 3 deletions(-)