Skip to content
Snippets Groups Projects
Commit a20ac447 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files

Merge branch 'wishbonized' of ohwr.org:hdl-core-lib/wr-cores into wishbonized

Conflicts:
	top/spec_1_1/wr_core_demo/spec_top.vhd
parents baf72fb3 2291d6ee
Branches
Tags
No related merge requests found
......@@ -12,6 +12,3 @@ modules = {"local" :
"modules/wrc_core" ],
"git" : "git://ohwr.org/hdl-core-lib/general-cores.git::wishbone_with_adapter"
}
\ No newline at end of file
......@@ -6,7 +6,7 @@
-- Author : Grzegorz Daniluk
-- Company : Elproma
-- Created : 2011-02-02
-- Last update: 2011-11-09
-- Last update: 2011-12-09
-- Platform : FPGA-generics
-- Standard : VHDL
-------------------------------------------------------------------------------
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment