From: Fabian Stemmler <stemmler@in.tum.de>
Date: Mon, 16 Sep 2019 15:56:03 +0000 (+0200)
Subject: Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim... 
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=2198fbadd2105c47ff4cd65d434616ae329802a1;hp=-c;p=Mograsim.git

Merge branch 'development' of https://gitlab.lrz.de/lrr-tum/students/eragp-misim-2019.git into development
---

2198fbadd2105c47ff4cd65d434616ae329802a1
diff --combined plugins/net.mograsim.plugin.core/plugin.xml
index 8391e4a2,87e1edec..cb94fb02
--- a/plugins/net.mograsim.plugin.core/plugin.xml
+++ b/plugins/net.mograsim.plugin.core/plugin.xml
@@@ -12,14 -12,6 +12,14 @@@
              name="%content-type.name"
              priority="high">
        </content-type>
 +      <content-type
 +            base-type="org.eclipse.core.runtime.text"
 +            default-charset="UTF-8"
 +            file-extensions="mpm"
 +            id="net.mograsim.plugin.mpm"
 +            name="%content-type.mpm.name"
 +            priority="high">
 +      </content-type>
     </extension>
     <extension
           point="org.eclipse.ui.editors">
@@@ -27,16 -19,6 +27,16 @@@
              contentTypeId="net.mograsim.plugin.asm"
              editorId="org.eclipse.ui.genericeditor.GenericEditor">
        </editorContentTypeBinding>
 +      <editorContentTypeBinding
 +            contentTypeId="net.mograsim.plugin.mpm"
 +            editorId="net.mograsim.plugin.tables.mi.InstructionView">
 +      </editorContentTypeBinding>
 +      <editor
 +      		name="%view.name.2"
 +      		icon="icons/mograsim/blue-orange/icon_blue-orange_7x8.png"
 +      		class="net.mograsim.plugin.tables.mi.InstructionView"
 +      		id="net.mograsim.plugin.tables.mi.InstructionView">
 +      </editor>
     </extension>
     <extension
           point="org.eclipse.ui.genericeditor.presentationReconcilers">
@@@ -356,5 -338,13 +356,13 @@@
              label="%fontDefinition.label">
        </fontDefinition>
     </extension>
+    <extension
+          point="org.eclipse.ui.preferencePages">
+       <page
+             class="net.mograsim.plugin.MainPreferencePage"
+             id="net.mograsim.plugin.core.mainprefpage"
+             name="Mograsim preferences">
+       </page>
+    </extension>
  
  </plugin>