eca/scu: Resolve conflicts with newest WR-Core (f60fd166) · Commits · Projects / White Rabbit core collection · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

White Rabbit core collection
- Activity
- Members
- Labels
- Releases
- Incidents
- Service Desk

Snippets Groups Projects

Projects
White Rabbit core collection
Commits
f60fd166

Commit f60fd166 authored 12 years ago by

Wesley W. Terpstra

Downloads
- Patches
- Plain Diff

eca/scu: Resolve conflicts with newest WR-Core

parent c7f016cf

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

modules/wr_eca/eca_pkg.vhd 2 additions, 2 deletions

modules/wr_eca/eca_pkg.vhd
modules/wr_eca/eca_wr_time.vhd 4 additions, 4 deletions

modules/wr_eca/eca_wr_time.vhd
modules/wr_eca/wr_eca.vhd 2 additions, 2 deletions

modules/wr_eca/wr_eca.vhd
syn/gsi_scu/wr_core_demo/scu.qsf 1 addition, 0 deletions

syn/gsi_scu/wr_core_demo/scu.qsf
top/gsi_scu/wr_core_demo/scu_top.vhd 9 additions, 8 deletions

top/gsi_scu/wr_core_demo/scu_top.vhd

with 18 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