diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-07-17 17:25:57 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-07-17 17:25:57 -0400 |
| commit | f7b9a0c6922c86cd54c1300ab45209d8e2db13df (patch) | |
| tree | 5ede528cd302e85bc40edcad876525659f4e1ed2 /gr-audio | |
| parent | caa4af889f54a696d3a533c77c5016df82f2987c (diff) | |
| parent | 04409d2ba42ac5b372a7b6bb7e9c8de5722d76d7 (diff) | |
Merge branch '8psk' into next
Conflicts:
gr-msdd6000/src/Makefile.swig.gen
Diffstat (limited to 'gr-audio')
| -rw-r--r-- | gr-audio/swig/Makefile.swig.gen | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-audio/swig/Makefile.swig.gen b/gr-audio/swig/Makefile.swig.gen index 7cdf046658..14322c0e51 100644 --- a/gr-audio/swig/Makefile.swig.gen +++ b/gr-audio/swig/Makefile.swig.gen @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -105,7 +105,7 @@ _audio_swig_la_CXXFLAGS = \ $(audio_swig_la_swig_cxxflags) python/audio_swig.cc: audio_swig.py -audio_swig.py: audio_swig.i +audio_swig.py: audio_swig.i # Include the python dependencies for this file -include python/audio_swig.d |