summaryrefslogtreecommitdiff
path: root/grc/python/Platform.py
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2011-03-14 20:07:36 -0700
committerJohnathan Corgan <jcorgan@corganenterprises.com>2011-03-14 20:07:36 -0700
commit22deb62a872413bdeff63e4fb565b4bcce2c6508 (patch)
tree79571572f1f130b5153019d70d31b2c868cf0b97 /grc/python/Platform.py
parentf3d373492fe415ced2bbf0be3f8e6da66576fcdc (diff)
parent4d5096c8b084c5832256dc2cd8bb617ee93d94a4 (diff)
Merge remote branch 'jblum/mergeme/qtgui/grc' into next
* jblum/mergeme/qtgui/grc: (27 commits) qtgui: removed python directory that was added, never used qtgui-grc: added suport in main template for theme icon qtgui-grc: minor tweaks to the various things qtgui-grc: added read-only thermo widget to range block qtgui-grc: fix for list option working in chooser block qtgui-grc: added check for pyqwt in config grc: added function args to probe block and documentation grc: rework the probe blocks and how they fit into grc qtgui-grc: moved slider to range, added knob and gui tweaks qtgui-grc: use a vboxlayout for the top_layout qtgui-grc: made slider widget components (counter/slider) optional qtgui-grc: add engineering notation to entry and label + other tweaks qtgui-grc: enable start/stop control through qt widgets qtgui-grc: rename the text entry and label blocks grc-qtgui: creaded check box widget with qtgui, cleanup label code grc-qtgui: added variable text box and static text widgets grc-qtgui: pick correct signal overload for variable chooser grc-qtgui: added radio button support, tweaks, more options grc-qtgui: work on variable chooser block grc: work on generator for gui flowgraphs to simplify generation ...
Diffstat (limited to 'grc/python/Platform.py')
-rw-r--r--grc/python/Platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/grc/python/Platform.py b/grc/python/Platform.py
index 04db0b9b02..ec3f940968 100644
--- a/grc/python/Platform.py
+++ b/grc/python/Platform.py
@@ -1,5 +1,5 @@
"""
-Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of GNU Radio
GNU Radio Companion is free software; you can redistribute it and/or