diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:29 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-04-08 15:37:29 -0400 |
| commit | 21b64f070a3eb38ab044529a6ddd9cd6b6d0a2cb (patch) | |
| tree | 4e72909a051b0a4ac428252d15f34b53bcc986b6 /grc/python/Platform.py | |
| parent | d7093fd06d0ec37f6ba2841d202fe90f4fa3661e (diff) | |
| parent | 5c358afd00347f5da7a59dd73ea79cd3df26659d (diff) | |
Merge branch 'master' into constell_obj
Conflicts:
gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
gr-audio-oss/src/Makefile.swig.gen
gr-audio/swig/Makefile.swig.gen
Diffstat (limited to 'grc/python/Platform.py')
| -rw-r--r-- | grc/python/Platform.py | 2 |
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 |