diff options
author | Tom Rondeau | 2011-01-15 15:26:40 -0500 |
---|---|---|
committer | Tom Rondeau | 2011-01-15 15:26:40 -0500 |
commit | cb3520203232d958962bd3b871f22675fe9c6bb5 (patch) | |
tree | 2e32c70447a32e965d127d4b359745d2d552258c /volk/Makefile.am | |
parent | a2262b6bb70923d89e96ca0d597d96a8a01e4b67 (diff) | |
parent | 2e8610450bc467400f8de2976cc6c1743025aff1 (diff) | |
download | gnuradio-cb3520203232d958962bd3b871f22675fe9c6bb5.tar.gz gnuradio-cb3520203232d958962bd3b871f22675fe9c6bb5.tar.bz2 gnuradio-cb3520203232d958962bd3b871f22675fe9c6bb5.zip |
Merge branch 'volkosx' into next
Diffstat (limited to 'volk/Makefile.am')
-rw-r--r-- | volk/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/volk/Makefile.am b/volk/Makefile.am index 3521dd0e4..4c6951ca7 100644 --- a/volk/Makefile.am +++ b/volk/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2008 Free Software Foundation, Inc. +# Copyright 2004,2008,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # |