Revision 510632d8
| ID | 510632d8968eb95d383da4cf2d72184d66da0bee |
Merge branch 'master' into next
Conflicts:
usrp2/top/N2x0/u2plus_core.v
usrp2/top/USRP2/u2_core.v
Files
- added
- modified
- copied
- renamed
- deleted
| ID | 510632d8968eb95d383da4cf2d72184d66da0bee |
Added by Josh Blum about 1 year ago
Merge branch 'master' into next
Conflicts:
usrp2/top/N2x0/u2plus_core.v
usrp2/top/USRP2/u2_core.v