projects / Mograsim.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 06eaa32 f2b5f70)
Merge branch 'development' of
authorFabian Stemmler <stemmler@in.tum.de>
Sat, 13 Jul 2019 10:33:03 +0000 (12:33 +0200)
committerFabian Stemmler <stemmler@in.tum.de>
Sat, 13 Jul 2019 10:33:03 +0000 (12:33 +0200)
commit47ea68ed5c444dd14864412639f6a6fd60ab8a0f
treebb4b30d997cf6f6cfadf63782c436da1c8527671tree | snapshot
parent06eaa32eb35adf937f1e1a7b8a640ee117bfdc55commit | diff
parentf2b5f70f4783092695033017672944330203b5b9commit | diff
Merge branch 'development' of
https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into
development

Conflicts:
net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/DeserializedSubmodelComponent.java
net.mograsim.logic.ui/src/net/mograsim/logic/ui/serializing/IndirectGUIComponentCreator.java
61 files changed:
net.mograsim.logic.model.editor/.classpath | | blob
net.mograsim.logic.model.editor/.gitignore | | blob
net.mograsim.logic.model.editor/.project | | blob
net.mograsim.logic.model.editor/.settings/org.eclipse.jdt.core.prefs | | blob
net.mograsim.logic.model.editor/META-INF/MANIFEST.MF | | blob
net.mograsim.logic.model.editor/build.properties | | blob
net.mograsim.logic.model.editor/components/GUI_rsLatch.json | | blob
net.mograsim.logic.model.editor/components/GUIand.json | | blob
net.mograsim.logic.model.editor/components/GUIand41.json | | blob
net.mograsim.logic.model.editor/components/GUIandor414.json | | blob
net.mograsim.logic.model.editor/components/GUIdemux2.json | | blob
net.mograsim.logic.model.editor/components/GUIdff.json | | blob
net.mograsim.logic.model.editor/components/GUIdlatch.json | | blob
net.mograsim.logic.model.editor/components/GUIdlatch4.json | | blob
net.mograsim.logic.model.editor/components/GUIfulladder.json | | blob
net.mograsim.logic.model.editor/components/GUIhalfadder.json | | blob
net.mograsim.logic.model.editor/components/GUImux1.json | | blob
net.mograsim.logic.model.editor/components/GUImux1_4.json | | blob
net.mograsim.logic.model.editor/components/GUInand3.json | | blob
net.mograsim.logic.model.editor/components/GUInot4.json | | blob
net.mograsim.logic.model.editor/components/GUIor4.json | | blob
net.mograsim.logic.model.editor/components/GUIor_4.json | | blob
net.mograsim.logic.model.editor/components/GUIram2.json | | blob
net.mograsim.logic.model.editor/components/GUIram4.json | | blob
net.mograsim.logic.model.editor/components/GUIsel2_4.json | | blob
net.mograsim.logic.model.editor/components/GUIsel3_4.json | | blob
net.mograsim.logic.model.editor/components/GUIxor.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUFuncDecode.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclDecode.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUInclSourceDecodeInclFunctionDecode.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901ALUOneBit.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901DestDecode.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901QReg.json | | blob
net.mograsim.logic.model.editor/components/am2901/GUIAm2901SourceDecode.json | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/DialogManager.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditableSubmodelComponent.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorCanvas.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorGUI.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/EditorUserInput.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/SaveLoadManager.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Selection.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/ComponentHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/CornerHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/Handle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/HandleManager.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/InterfacePinHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/PinHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/StaticPinHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WireHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/handles/WirePointHandle.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/BoxSelectionState.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/CreateWireState.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/EditorState.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/GrabState.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/SelectionState.java | | blob
net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/states/StateManager.java | | blob
net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/GUIWire.java | diff2 | blob | history
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/DeserializedSubmodelComponent.java | diff2 | blob | history
net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectGUIComponentCreator.java | diff2 | blob | history
Mirror of https://github.com/Mograsim-Team/Mograsim