[Commit-gnuradio] [gnuradio] 09/13: Merge remote-tracking branch 'gnuradio-wg-grc/grc_block_and_prefs_path'

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit ffe1a7a6fecbc46ff39ade85d7250f57c4394fd3
Merge: 8be0efd 14625c6
Author: Johnathan Corgan <address@hidden>
Date:   Tue Apr 15 15:40:57 2014 -0700

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

 grc/base/Platform.py    |  1 +
 grc/gui/Messages.py     | 11 ++++++++++-
 grc/gui/Platform.py     |  7 ++++++-
 grc/gui/Preferences.py  |  5 ++---
 grc/python/Constants.py |  5 ++++-
 grc/python/Platform.py  | 15 +++++++++++----
 6 files changed, 34 insertions(+), 10 deletions(-)