diff options
| author | Ian Buckley <ianb@server2.(none)> | 2010-08-12 12:22:08 -0700 |
|---|---|---|
| committer | Ian Buckley <ianb@server2.(none)> | 2010-08-12 12:22:08 -0700 |
| commit | 82e254b280db865899a46cea11d4d4785d8034a2 (patch) | |
| tree | 9728e5c69e78cd9ebe04e6c041b3a2de881154e8 /usrp1/sdr_lib | |
| parent | 6e0d78f4cbf6f0d6cda6007f11b4fb4dd4edaee9 (diff) | |
| parent | 298b5c2dfd6aabcb89c769a8a1b54181f5dc4273 (diff) | |
| download | uhd-82e254b280db865899a46cea11d4d4785d8034a2.tar.gz uhd-82e254b280db865899a46cea11d4d4785d8034a2.tar.bz2 uhd-82e254b280db865899a46cea11d4d4785d8034a2.zip | |
Merge branch 'ise12_efifo_work' of git@ettus.sourcerepo.com:ettus/fpgapriv into ise12_efifo_work
Conflicts:
usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.ngc
usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.v
usrp2/coregen/fifo_xlnx_512x36_2clk_18to36.xco
usrp2/coregen/fifo_xlnx_512x36_2clk_36to18.ngc
Resolving conflicts by regenerating files clenly in ISE12.1 coregen
Diffstat (limited to 'usrp1/sdr_lib')
0 files changed, 0 insertions, 0 deletions