[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 02/02: Merge branch 'master' into next |
|
Date: |
Fri, 28 Aug 2015 19:19:54 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit 42311299bd5c5fbd700840e947a73e92ff8ea86c
Merge: 1b93492 68c6862
Author: Johnathan Corgan <address@hidden>
Date: Fri Aug 28 12:13:34 2015 -0700
Merge branch 'master' into next
Conflicts:
gr-atsc/lib/atsci_equalizer_lms2.cc
grc/CMakeLists.txt | 17 +++++----
grc/gui/ActionHandler.py | 30 +++++++++-------
grc/gui/Actions.py | 7 ++--
grc/gui/Dialogs.py | 31 ++++++++++++++---
grc/gui/Messages.py | 2 +-
grc/gui/Preferences.py | 91 ++++++++++++++++++++++++------------------------
grc/python/Constants.py | 25 +++++++------
grc/python/Generator.py | 1 +
grc/python/Platform.py | 37 +++++++++++++++-----
9 files changed, 145 insertions(+), 96 deletions(-)