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/usrp1/.gitignore | |
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/usrp1/.gitignore')
-rw-r--r-- | firmware/fx2/src/usrp1/.gitignore | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/firmware/fx2/src/usrp1/.gitignore b/firmware/fx2/src/usrp1/.gitignore deleted file mode 100644 index 54a9e9415..000000000 --- a/firmware/fx2/src/usrp1/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -/*.ihx -/*.lnk -/*.lst -/*.map -/*.mem -/*.rel -/*.rst -/*.sym -/blink_leds.asm -/usrp_common.asm -/command_loop.asm -/fpga.asm -/*.asm -/Makefile -/Makefile.in -/usrp_gpif.c -/usrp_gpif_inline.h -/Makefile.in -/burn-usrp2-eeprom -/burn-usrp4-eeprom |