diff options
author | Johnathan Corgan | 2011-07-03 18:00:24 -0700 |
---|---|---|
committer | Johnathan Corgan | 2011-07-03 18:00:24 -0700 |
commit | 0ff8efadfbd68def82b360db461ae9adb52f176f (patch) | |
tree | 3ac14e9019c79b9b7bd1e09fa7eb8777345c0d63 /gr-usrp2/Makefile.am | |
parent | 250998de9bf1dc3550e33309b316268f857499a2 (diff) | |
parent | 2930812784e1b2d9325efccc163448e14118af7c (diff) | |
download | gnuradio-0ff8efadfbd68def82b360db461ae9adb52f176f.tar.gz gnuradio-0ff8efadfbd68def82b360db461ae9adb52f176f.tar.bz2 gnuradio-0ff8efadfbd68def82b360db461ae9adb52f176f.zip |
Merge branch 'master' into next
Diffstat (limited to 'gr-usrp2/Makefile.am')
-rw-r--r-- | gr-usrp2/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gr-usrp2/Makefile.am b/gr-usrp2/Makefile.am index f6120884a..895032fb0 100644 --- a/gr-usrp2/Makefile.am +++ b/gr-usrp2/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = src +SUBDIRS = src apps if PYTHON SUBDIRS += grc |