[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
|
From: |
git |
|
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
|
Date: |
Wed, 5 Aug 2015 15:27:38 +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 2ca863497943e0cc9046e6a5368e0d88576692b2
Merge: 5070822 6cf003d
Author: Johnathan Corgan <address@hidden>
Date: Wed Aug 5 08:18:05 2015 -0700
Merge branch 'master' into next
grc/base/Block.py | 2 -
grc/freedesktop/CMakeLists.txt | 2 +
grc/freedesktop/convert.sh | 14 ++
grc/freedesktop/gnuradio-grc.desktop | 1 +
grc/freedesktop/gnuradio_logo_icon-square.svg | 124 +++++++++++++++
grc/freedesktop/grc-icon-128.png | Bin 3570 -> 4758 bytes
grc/freedesktop/grc-icon-16.png | Bin 0 -> 537 bytes
grc/freedesktop/grc-icon-24.png | Bin 0 -> 840 bytes
grc/freedesktop/grc-icon-256.png | Bin 7843 -> 9762 bytes
grc/freedesktop/grc-icon-256.svg | 216 --------------------------
grc/freedesktop/grc-icon-32.png | Bin 1060 -> 1148 bytes
grc/freedesktop/grc-icon-48.png | Bin 1691 -> 1796 bytes
grc/freedesktop/grc-icon-64.png | Bin 1893 -> 2355 bytes
grc/freedesktop/grc_setup_freedesktop.in | 2 +-
grc/python/Generator.py | 2 +-
grc/python/Platform.py | 6 +-
16 files changed, 146 insertions(+), 223 deletions(-)