diff options
author | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-03 18:18:41 -0700 |
---|---|---|
committer | Johnathan Corgan <jcorgan@corganenterprises.com> | 2012-04-03 18:18:41 -0700 |
commit | 6522dd051302a1691a7ce27be78acd81d733fdb2 (patch) | |
tree | 13e8c6308e43e5a65cd730be3479a02812e37429 /gr-uhd/swig | |
parent | fb8292238c7efff4a5b2a7ae26d3a2835f9be3ce (diff) | |
parent | fc03a9b18ca874cac546b7a414089d3649dce48d (diff) |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/swig')
-rw-r--r-- | gr-uhd/swig/__init__.py | 2 | ||||
-rw-r--r-- | gr-uhd/swig/uhd_swig.i | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-uhd/swig/__init__.py b/gr-uhd/swig/__init__.py index 82dbdd9e75..b4045e77fb 100644 --- a/gr-uhd/swig/__init__.py +++ b/gr-uhd/swig/__init__.py @@ -1,5 +1,5 @@ # -# Copyright 2010-2011 Free Software Foundation, Inc. +# Copyright 2010-2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # diff --git a/gr-uhd/swig/uhd_swig.i b/gr-uhd/swig/uhd_swig.i index d814a5ae0c..cb74b3dcee 100644 --- a/gr-uhd/swig/uhd_swig.i +++ b/gr-uhd/swig/uhd_swig.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010-2011 Free Software Foundation, Inc. + * Copyright 2010-2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * |