diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-05 13:53:39 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-05 13:53:39 -0700 |
| commit | 3ac3457184bc3b251ce7398eee56c931983abe65 (patch) | |
| tree | 7cfa1ba616788ad083236272a323c3a6e2964da3 /firmware/fx2/src/Makefile.am | |
| parent | 144ebf29327981db8422049b451852744619678d (diff) | |
| parent | c473cc56fafcb47d6ba1f16e8c9fb89ff6c57bca (diff) | |
| download | uhd-3ac3457184bc3b251ce7398eee56c931983abe65.tar.gz uhd-3ac3457184bc3b251ce7398eee56c931983abe65.tar.bz2 uhd-3ac3457184bc3b251ce7398eee56c931983abe65.zip | |
Merge branch 'good_stuff' into mb_eeprom
Conflicts:
firmware/fx2/include
Diffstat (limited to 'firmware/fx2/src/Makefile.am')
| -rw-r--r-- | firmware/fx2/src/Makefile.am | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/firmware/fx2/src/Makefile.am b/firmware/fx2/src/Makefile.am deleted file mode 100644 index 5dcff2c85..000000000 --- a/firmware/fx2/src/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright 2004 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -SUBDIRS = common usrp1 |