Merge branch 'master' into proposed_master (2782bc8c) · Commits · Projects / Platform-independent core collection · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

P

Platform-independent core collection
- Activity
- Members
- Labels
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Projects
Platform-independent core collection
Commits
2782bc8c

Commit 2782bc8c authored 8 years ago by

Dimitris Lampridis

Downloads
- Plain Diff

Merge branch 'master' into proposed_master

parents 8cd05d79 6aa8e458

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

Manifest.py 7 additions, 7 deletions

Manifest.py
modules/genrams/Manifest.py 3 additions, 3 deletions

modules/genrams/Manifest.py
modules/genrams/common/Manifest.py 3 additions, 0 deletions

modules/genrams/common/Manifest.py
modules/genrams/common/generic_shiftreg_fifo.vhd 0 additions, 0 deletions

modules/genrams/common/generic_shiftreg_fifo.vhd
modules/genrams/common/inferred_async_fifo.vhd 0 additions, 0 deletions

modules/genrams/common/inferred_async_fifo.vhd
modules/genrams/common/inferred_sync_fifo.vhd 0 additions, 0 deletions

modules/genrams/common/inferred_sync_fifo.vhd
modules/genrams/generic/Manifest.py 1 addition, 4 deletions

modules/genrams/generic/Manifest.py
modules/genrams/xilinx/virtex6/Manifest.py 4 additions, 1 deletion

modules/genrams/xilinx/virtex6/Manifest.py
modules/wishbone/wishbone_pkg.vhd 5 additions, 1 deletion

modules/wishbone/wishbone_pkg.vhd

with 23 additions and 16 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment