projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Integrated new types, tests still work, not used yet
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
Merger.java
diff --git
a/era.mi/src/era/mi/logic/components/Merger.java
b/era.mi/src/era/mi/logic/components/Merger.java
index
860c010
..
7ef909b
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/Merger.java
+++ b/
era.mi/src/era/mi/logic/components/Merger.java
@@
-2,7
+2,7
@@
package era.mi.logic.components;
\r
import java.util.List;
\r
\r
-import era.mi.logic.Bit;
\r
+import era.mi.logic.
types.
Bit;
\r
import era.mi.logic.wires.Wire;
\r
import era.mi.logic.wires.Wire.WireEnd;
\r
import era.mi.logic.wires.WireObserver;
\r