diff options
| author | Nick Foster | 2011-01-21 11:20:08 -0800 |
|---|---|---|
| committer | Nick Foster | 2011-01-21 11:25:15 -0800 |
| commit | b6850bbdaeab5ce85d2414cfa9c8344fb6f91883 (patch) | |
| tree | a734ff207bf91945bc7157dba35829a11a7653a8 /gr-uhd/lib/Makefile.am | |
| parent | e3600f59e76c3dc08aedfd77629b7c5c48df86af (diff) | |
| parent | d429522b8cc0916c0dd8167284e9f7373f8c1663 (diff) | |
| download | gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.tar.gz gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.tar.bz2 gnuradio-b6850bbdaeab5ce85d2414cfa9c8344fb6f91883.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into volk_rename
Conflicts:
volk/lib/Makefile.am
Diffstat (limited to 'gr-uhd/lib/Makefile.am')
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index 1bcfbbbdc..7ddb45cb3 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010-2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,6 +41,7 @@ libgnuradio_uhd_la_LIBADD = \ libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS) grinclude_HEADERS = \ + gr_uhd_api.h \ uhd_multi_usrp_source.h \ uhd_multi_usrp_sink.h \ uhd_single_usrp_source.h \ |