diff options
| author | Matt Ettus <matt@ettus.com> | 2010-06-14 13:23:18 -0700 |
|---|---|---|
| committer | Matt Ettus <matt@ettus.com> | 2010-06-14 13:23:18 -0700 |
| commit | a97707caa8e9f19fdc81061ac11a73f41aab2704 (patch) | |
| tree | c75983a4caff316fe1c64cdba047229ac4584cc7 /usrp2/control_lib/mux4.v | |
| parent | a4b11332ab4f6a24bf4645c0b2770f9578a36f45 (diff) | |
| parent | 9445315e6a5cdfb29c4ead73b0fcd4d5fd75b900 (diff) | |
| download | uhd-a97707caa8e9f19fdc81061ac11a73f41aab2704.tar.gz uhd-a97707caa8e9f19fdc81061ac11a73f41aab2704.tar.bz2 uhd-a97707caa8e9f19fdc81061ac11a73f41aab2704.zip | |
Merge branch 'master' into u1e_newbuild
Made so Makefile changes as well to get it to build
* master:
new make works on ise12
produces good bin files
first attempt at cleaning up the build system
get rid of debug stuff to help timing
move u2_core into u2_rev3 directory to simplify directory structure and save headaches
Conflicts:
usrp2/fifo/fifo36_to_fifo18.v
usrp2/top/u2_rev3/Makefile
usrp2/top/u2_rev3/Makefile.udp
usrp2/top/u2_rev3/u2_core_udp.v
Diffstat (limited to 'usrp2/control_lib/mux4.v')
0 files changed, 0 insertions, 0 deletions