mograsim.net Git - Mograsim.git/commit

author	Fabian Stemmler <stemmler@in.tum.de>
	Mon, 20 May 2019 12:03:38 +0000 (14:03 +0200)
committer	Fabian Stemmler <stemmler@in.tum.de>
	Mon, 20 May 2019 12:03:38 +0000 (14:03 +0200)
commit	7c7b279981f4686d4fe165cf327ff5b52d71c5f6
tree	b04da5f88db1de2f360ae4f2dc476fbd96f60aa4	tree \| snapshot
parent	e059330d4c9b0b6a951943a6ff68f5c63c92951e	commit \| diff

Merge logic of origin into logic

Conflicts:
era.mi/src/era/mi/logic/components/BitDisplay.java
era.mi/src/era/mi/logic/components/Clock.java
era.mi/src/era/mi/logic/components/Demux.java
era.mi/src/era/mi/logic/components/Merger.java
era.mi/src/era/mi/logic/components/Mux.java
era.mi/src/era/mi/logic/components/TriStateBuffer.java
era.mi/src/era/mi/logic/components/gates/NotGate.java
era.mi/src/era/mi/logic/tests/Connector.java
era.mi/src/era/mi/logic/tests/GUITest.java
era.mi/src/era/mi/logic/wires/WireArray.java

22 files changed:

era.mi/.settings/org.eclipse.jdt.core.prefs		diff \| blob \| history
era.mi/.settings/org.eclipse.jdt.ui.prefs		diff \| blob \| history
era.mi/src/era/mi/logic/Simulation.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/BasicComponent.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/BitDisplay.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/Clock.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/Connector.java	[new file with mode: 0644]	blob
era.mi/src/era/mi/logic/components/Demux.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/Merger.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/Mux.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/Splitter.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/TriStateBuffer.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/gates/MultiInputGate.java		diff \| blob \| history
era.mi/src/era/mi/logic/components/gates/NotGate.java		diff \| blob \| history
era.mi/src/era/mi/logic/tests/ComponentTest.java		diff \| blob \| history
era.mi/src/era/mi/logic/tests/Connector.java		diff \| blob \| history
era.mi/src/era/mi/logic/tests/GUITest.java		diff \| blob \| history
era.mi/src/era/mi/logic/timeline/Timeline.java		diff \| blob \| history
era.mi/src/era/mi/logic/timeline/TimelineEvent.java		diff \| blob \| history
era.mi/src/era/mi/logic/wires/Wire.java		diff \| blob \| history
era.mi/src/era/mi/logic/wires/WireArrayObserver.java	[deleted file]	blob \| history
era.mi/src/era/mi/logic/wires/WireObserver.java	[new file with mode: 0644]	blob

Mirror of https://github.com/Mograsim-Team/Mograsim

RSS Atom