Index: trunk/org.modelica.mdt.breakpoint/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.modelica.mdt.breakpoint/META-INF/MANIFEST.MF	(revision 1512)
+++ trunk/org.modelica.mdt.breakpoint/META-INF/MANIFEST.MF	(revision 1513)
@@ -3,5 +3,5 @@
 Bundle-Name: Breakpoint
 Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true
-Bundle-Version: 0.7.24
+Bundle-Version: 0.7.25
 Bundle-Vendor: Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University
 Bundle-Activator: org.modelica.mdt.breakpoint.Activator
Index: trunk/org.modelica.mdt.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.modelica.mdt.core/META-INF/MANIFEST.MF	(revision 1512)
+++ trunk/org.modelica.mdt.core/META-INF/MANIFEST.MF	(revision 1513)
@@ -3,5 +3,5 @@
 Bundle-Name: Modelica Development Tooling
 Bundle-SymbolicName: org.modelica.mdt.core; singleton:=true
-Bundle-Version: 0.7.24
+Bundle-Version: 0.7.25
 Bundle-Vendor: Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University
 Require-Bundle: org.eclipse.ui,
Index: trunk/org.modelica.mdt.debug.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.modelica.mdt.debug.core/META-INF/MANIFEST.MF	(revision 1512)
+++ trunk/org.modelica.mdt.debug.core/META-INF/MANIFEST.MF	(revision 1513)
@@ -3,5 +3,5 @@
 Bundle-Name: MDT Debug Core Plugin
 Bundle-SymbolicName: org.modelica.mdt.debug.core; singleton:=true
-Bundle-Version: 0.7.24
+Bundle-Version: 0.7.25
 Bundle-Vendor: Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University
 Bundle-Activator: org.modelica.mdt.debug.core.MDTDebugCorePlugin
Index: trunk/org.modelica.mdt.debug.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.modelica.mdt.debug.ui/META-INF/MANIFEST.MF	(revision 1512)
+++ trunk/org.modelica.mdt.debug.ui/META-INF/MANIFEST.MF	(revision 1513)
@@ -3,5 +3,5 @@
 Bundle-Name: MDT Debug UI Plugin
 Bundle-SymbolicName: org.modelica.mdt.debug.ui; singleton:=true
-Bundle-Version: 0.7.24
+Bundle-Version: 0.7.25
 Bundle-Vendor: Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University
 Bundle-Activator: org.modelica.mdt.debug.ui.MDTDebugUIPlugin
Index: trunk/org.modelica.mdt.feature/feature.xml
===================================================================
--- trunk/org.modelica.mdt.feature/feature.xml	(revision 1512)
+++ trunk/org.modelica.mdt.feature/feature.xml	(revision 1513)
@@ -3,5 +3,5 @@
       id="org.modelica.mdt"
       label="Modelica Development Tooling"
-      version="0.7.24"
+      version="0.7.25"
       provider-name="Open Source Modelica Consortium (OpenModelica@ida.liu.se)">
 
@@ -75,5 +75,5 @@
          download-size="0"
          install-size="0"
-         version="0.7.24"
+         version="0.7.25"
          unpack="false"/>
 
@@ -82,5 +82,5 @@
          download-size="0"
          install-size="0"
-         version="0.7.24"
+         version="0.7.25"
          unpack="false"/>
 
@@ -89,5 +89,5 @@
          download-size="0"
          install-size="0"
-         version="0.7.24"
+         version="0.7.25"
          unpack="false"/>
 
@@ -96,5 +96,5 @@
          download-size="0"
          install-size="0"
-         version="0.7.24"
+         version="0.7.25"
          unpack="false"/>
 
@@ -103,5 +103,5 @@
          download-size="0"
          install-size="0"
-         version="0.7.24"
+         version="0.7.25"
          unpack="false"/>
 
@@ -110,5 +110,5 @@
          download-size="0"
          install-size="0"
-         version="0.7.24"
+         version="0.7.25"
          unpack="false"/>
 
Index: trunk/org.modelica.mdt.omc/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.modelica.mdt.omc/META-INF/MANIFEST.MF	(revision 1512)
+++ trunk/org.modelica.mdt.omc/META-INF/MANIFEST.MF	(revision 1513)
@@ -3,5 +3,5 @@
 Bundle-Name: Modelica Development Tooling OMC proxy
 Bundle-SymbolicName: org.modelica.mdt.omc; singleton:=true
-Bundle-Version: 0.7.24
+Bundle-Version: 0.7.25
 Bundle-Vendor: Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University
 Require-Bundle: org.eclipse.core.runtime,
Index: trunk/org.modelica.mdt.site/artifacts.xml
===================================================================
--- trunk/org.modelica.mdt.site/artifacts.xml	(revision 1512)
+++ trunk/org.modelica.mdt.site/artifacts.xml	(revision 1513)
@@ -3,5 +3,5 @@
 <repository name='Exported Repository' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1334094526984'/>
+    <property name='p2.timestamp' value='1337289417711'/>
     <property name='p2.compressed' value='true'/>
   </properties>
@@ -11,5 +11,5 @@
     <rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
   </mappings>
-  <artifacts size='125'>
+  <artifacts size='132'>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.21'>
       <properties size='2'>
@@ -72,4 +72,10 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.8'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='30830'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.17'>
       <properties size='2'>
@@ -78,10 +84,4 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.8'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='30830'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.13'>
       <properties size='2'>
@@ -154,16 +154,4 @@
         <property name='artifact.size' value='4096'/>
         <property name='download.size' value='833805'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.7'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='56744'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.9'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='6715'/>
       </properties>
     </artifact>
@@ -174,4 +162,16 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.9'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='6715'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.7'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='56744'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.ui' version='0.7.15'>
       <properties size='2'>
@@ -246,4 +246,10 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.25'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='265356'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.16'>
       <properties size='2'>
@@ -264,4 +270,10 @@
       </properties>
     </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.21'>
+      <properties size='2'>
+        <property name='download.contentType' value='application/zip'/>
+        <property name='download.size' value='1652'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.9'>
       <properties size='2'>
@@ -270,10 +282,4 @@
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.21'>
-      <properties size='2'>
-        <property name='download.contentType' value='application/zip'/>
-        <property name='download.size' value='1652'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.16'>
       <properties size='2'>
@@ -388,4 +394,10 @@
         <property name='artifact.size' value='4096'/>
         <property name='download.size' value='120506'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.25'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='6731'/>
       </properties>
     </artifact>
@@ -498,4 +510,10 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.25'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='30919'/>
+      </properties>
+    </artifact>
     <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.12'>
       <properties size='2'>
@@ -516,4 +534,10 @@
       </properties>
     </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.25'>
+      <properties size='2'>
+        <property name='download.contentType' value='application/zip'/>
+        <property name='download.size' value='1652'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.7'>
       <properties size='2'>
@@ -594,4 +618,10 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.14'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='120482'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.21'>
       <properties size='2'>
@@ -600,5 +630,35 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.14'>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.25'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='121843'/>
+      </properties>
+    </artifact>
+    <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.14'>
+      <properties size='2'>
+        <property name='download.contentType' value='application/zip'/>
+        <property name='download.size' value='1652'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.25'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='97501'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.18'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='120504'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.ui' version='0.7.7'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='818040'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.15'>
       <properties size='2'>
         <property name='artifact.size' value='4096'/>
@@ -606,11 +666,5 @@
       </properties>
     </artifact>
-    <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.14'>
-      <properties size='2'>
-        <property name='download.contentType' value='application/zip'/>
-        <property name='download.size' value='1652'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.18'>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.16'>
       <properties size='2'>
         <property name='artifact.size' value='4096'/>
@@ -618,14 +672,8 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.ui' version='0.7.7'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='818040'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.15'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='120482'/>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.12'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='6714'/>
       </properties>
     </artifact>
@@ -636,14 +684,8 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.12'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='6714'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.16'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='120504'/>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.15'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='89337'/>
       </properties>
     </artifact>
@@ -654,10 +696,4 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.15'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='89337'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.24'>
       <properties size='2'>
@@ -670,10 +706,4 @@
         <property name='artifact.size' value='4096'/>
         <property name='download.size' value='243755'/>
-      </properties>
-    </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.9'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='244142'/>
       </properties>
     </artifact>
@@ -684,4 +714,10 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.9'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='244142'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.17'>
       <properties size='2'>
@@ -700,4 +736,10 @@
         <property name='artifact.size' value='4096'/>
         <property name='download.size' value='6716'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.10'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='243754'/>
       </properties>
     </artifact>
@@ -708,10 +750,4 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.10'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='243754'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.18'>
       <properties size='2'>
@@ -720,4 +756,10 @@
       </properties>
     </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.16'>
+      <properties size='2'>
+        <property name='artifact.size' value='4096'/>
+        <property name='download.size' value='89337'/>
+      </properties>
+    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.22'>
       <properties size='2'>
@@ -726,14 +768,14 @@
       </properties>
     </artifact>
-    <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.16'>
-      <properties size='2'>
-        <property name='artifact.size' value='4096'/>
-        <property name='download.size' value='89337'/>
-      </properties>
-    </artifact>
     <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.14'>
       <properties size='2'>
         <property name='artifact.size' value='4096'/>
         <property name='download.size' value='30830'/>
+      </properties>
+    </artifact>
+    <artifact classifier='osgi.bundle' id='org.modelica.mdt.ui' version='0.7.25'>
+      <properties size='2'>
+        <property name='artifact.size' value='8192'/>
+        <property name='download.size' value='838740'/>
       </properties>
     </artifact>
Index: trunk/org.modelica.mdt.site/content.xml
===================================================================
--- trunk/org.modelica.mdt.site/content.xml	(revision 1512)
+++ trunk/org.modelica.mdt.site/content.xml	(revision 1513)
@@ -3,8 +3,46 @@
 <repository name='Exported Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
   <properties size='2'>
-    <property name='p2.timestamp' value='1334094527010'/>
+    <property name='p2.timestamp' value='1337289417715'/>
     <property name='p2.compressed' value='true'/>
   </properties>
-  <units size='143'>
+  <units size='151'>
+    <unit id='org.modelica.mdt.breakpoint' version='0.7.25'>
+      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.25'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.25'/>
+        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.25
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.feature.jar' version='0.7.11'>
       <properties size='4'>
@@ -164,4 +202,39 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.feature.jar' version='0.7.25'>
+      <properties size='4'>
+        <property name='org.eclipse.equinox.p2.name' value='Modelica Development Tooling'/>
+        <property name='org.eclipse.equinox.p2.description' value='Contributes an environment for working with Modelica and MetaModelica&#xA;projects.&#xA;This software package is developed by &#xA;Adrian Pop [Adrian.Pop@liu.se],&#xA;Adeel Asghar [Adeel.Asghar@liu.se],&#xA;Elmir Jaguding, &#xA;Andreas Remar, &#xA;and plenty others at&#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Linköping University (LiU). &#xA;Visit http://www.openmodelica.org/ for more information about&#xA;this software and other related projects.'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.OpenModelica.org'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Open Source Modelica Consortium (OpenModelica@ida.liu.se)'/>
+      </properties>
+      <provides size='3'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.feature.jar' version='0.7.25'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
+        <provided namespace='org.eclipse.update.feature' name='org.modelica.mdt' version='0.7.25'/>
+      </provides>
+      <filter>
+        (org.eclipse.update.install.features=true)
+      </filter>
+      <artifacts size='1'>
+        <artifact classifier='org.eclipse.update.feature' id='org.modelica.mdt' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='zipped'>
+            true
+          </instruction>
+        </instructions>
+      </touchpointData>
+      <licenses size='1'>
+        <license uri='http://www.ida.liu.se/~pelab/modelica/OpenModelica/MDT/COPYING.html' url='http://www.ida.liu.se/~pelab/modelica/OpenModelica/MDT/COPYING.html'>
+          The Modelica Development Tooling (MDT) software is distributed under the conditions specified below.&#xA;Copyright (c) 2005-2011, &#xA;The MDT Team (Authors): &#xA;Adrian Pop [Adrian.Pop@liu.se],&#xA;Adeel Asghar [Adeel.Asghar@liu.se] &#xA;Elmir Jagudin, &#xA;Andreas Remar, &#xA;Open Source Modelica Consortium,&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköping University (LiU).&#xA;All rights reserved.&#xA;&#xA;(The new BSD license, see also http://www.opensource.org/licenses/bsd-license.php)&#xA;&#xA;Redistribution and use in source and binary forms, with or without &#xA;modification, are permitted provided that the following conditions are met:&#xA;&#xA;* Redistributions of source code must retain the above copyright notice, &#xA;  this list of conditions and the following disclaimer. &#xA;  &#xA;* Redistributions in binary form must reproduce the above copyright notice, &#xA;  this list of conditions and the following disclaimer in the documentation &#xA;  and/or other materials provided with the distribution. &#xA;* Neither the name of the Authors and Linköping University nor the names of its &#xA;  contributors may be used to endorse or promote products derived from this &#xA;  software without specific prior written permission. &#xA;  &#xA;THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND &#xA;ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED &#xA;WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. &#xA;IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, &#xA;INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, &#xA;BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, &#xA;DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF &#xA;LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE &#xA;OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED &#xA;OF THE POSSIBILITY OF SUCH DAMAGE.
+        </license>
+      </licenses>
+      <copyright uri='http://www.OpenModelica.org' url='http://www.OpenModelica.org'>
+        Copyright (c) 2005-2011, &#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköpings University (LiU).
+      </copyright>
+    </unit>
     <unit id='org.modelica.mdt.ui' version='0.7.11'>
       <update id='org.modelica.mdt.ui' range='[0.0.0,0.7.11)' severity='0'/>
@@ -217,4 +290,37 @@
           <instruction key='manifest'>
             Bundle-SymbolicName: org.modelica.mdt.ui; singleton:=true&#xA;Bundle-Version: 0.7.11
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='org.modelica.mdt.omc' version='0.7.25'>
+      <update id='org.modelica.mdt.omc' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Modelica Development Tooling OMC proxy'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University'/>
+      </properties>
+      <provides size='5'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.omc' version='0.7.25'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.omc' version='0.7.25'/>
+        <provided namespace='java.package' name='org.modelica.mdt.omc' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.omc.internal' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='6'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.omc' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.omc; singleton:=true&#xA;Bundle-Version: 0.7.25
           </instruction>
         </instructions>
@@ -758,4 +864,43 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.breakpoint' version='0.7.9'>
+      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.9)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
+        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.9'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.9'/>
+        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.9'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.9
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.feature.group' version='0.7.11' singleton='false'>
       <update id='org.modelica.mdt.feature.group' range='[0.0.0,0.7.11)' severity='0'/>
@@ -792,43 +937,4 @@
         Copyright (c) 2005-2011, &#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköpings University (LiU).
       </copyright>
-    </unit>
-    <unit id='org.modelica.mdt.breakpoint' version='0.7.9'>
-      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.9)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
-        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
-      </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.9'/>
-        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.9'/>
-        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='12'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.9'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.9
-          </instruction>
-        </instructions>
-      </touchpointData>
     </unit>
     <unit id='org.modelica.mdt.debug.core' version='0.7.13'>
@@ -937,4 +1043,39 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.feature.group' version='0.7.25' singleton='false'>
+      <update id='org.modelica.mdt.feature.group' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='5'>
+        <property name='org.eclipse.equinox.p2.name' value='Modelica Development Tooling'/>
+        <property name='org.eclipse.equinox.p2.description' value='Contributes an environment for working with Modelica and MetaModelica&#xA;projects.&#xA;This software package is developed by &#xA;Adrian Pop [Adrian.Pop@liu.se],&#xA;Adeel Asghar [Adeel.Asghar@liu.se],&#xA;Elmir Jaguding, &#xA;Andreas Remar, &#xA;and plenty others at&#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Linköping University (LiU). &#xA;Visit http://www.openmodelica.org/ for more information about&#xA;this software and other related projects.'/>
+        <property name='org.eclipse.equinox.p2.description.url' value='http://www.OpenModelica.org'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Open Source Modelica Consortium (OpenModelica@ida.liu.se)'/>
+        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
+      </properties>
+      <provides size='1'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.feature.group' version='0.7.25'/>
+      </provides>
+      <requires size='7'>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.core' range='[0.7.25,0.7.25]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.ui' range='[0.7.25,0.7.25]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.omc' range='[0.7.25,0.7.25]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.debug.core' range='[0.7.25,0.7.25]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.debug.ui' range='[0.7.25,0.7.25]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' range='[0.7.25,0.7.25]'/>
+        <required namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.feature.jar' range='[0.7.25,0.7.25]'>
+          <filter>
+            (org.eclipse.update.install.features=true)
+          </filter>
+        </required>
+      </requires>
+      <touchpoint id='null' version='0.0.0'/>
+      <licenses size='1'>
+        <license uri='http://www.ida.liu.se/~pelab/modelica/OpenModelica/MDT/COPYING.html' url='http://www.ida.liu.se/~pelab/modelica/OpenModelica/MDT/COPYING.html'>
+          The Modelica Development Tooling (MDT) software is distributed under the conditions specified below.&#xA;Copyright (c) 2005-2011, &#xA;The MDT Team (Authors): &#xA;Adrian Pop [Adrian.Pop@liu.se],&#xA;Adeel Asghar [Adeel.Asghar@liu.se] &#xA;Elmir Jagudin, &#xA;Andreas Remar, &#xA;Open Source Modelica Consortium,&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköping University (LiU).&#xA;All rights reserved.&#xA;&#xA;(The new BSD license, see also http://www.opensource.org/licenses/bsd-license.php)&#xA;&#xA;Redistribution and use in source and binary forms, with or without &#xA;modification, are permitted provided that the following conditions are met:&#xA;&#xA;* Redistributions of source code must retain the above copyright notice, &#xA;  this list of conditions and the following disclaimer. &#xA;  &#xA;* Redistributions in binary form must reproduce the above copyright notice, &#xA;  this list of conditions and the following disclaimer in the documentation &#xA;  and/or other materials provided with the distribution. &#xA;* Neither the name of the Authors and Linköping University nor the names of its &#xA;  contributors may be used to endorse or promote products derived from this &#xA;  software without specific prior written permission. &#xA;  &#xA;THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS &quot;AS IS&quot; AND &#xA;ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED &#xA;WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. &#xA;IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, &#xA;INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, &#xA;BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, &#xA;DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF &#xA;LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE &#xA;OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED &#xA;OF THE POSSIBILITY OF SUCH DAMAGE.
+        </license>
+      </licenses>
+      <copyright uri='http://www.OpenModelica.org' url='http://www.OpenModelica.org'>
+        Copyright (c) 2005-2011, &#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköpings University (LiU).
+      </copyright>
+    </unit>
     <unit id='org.modelica.mdt.feature.jar' version='0.7.9'>
       <properties size='4'>
@@ -1190,4 +1331,43 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.breakpoint' version='0.7.10'>
+      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.10)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
+        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.10'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.10'/>
+        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.10'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.10
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.feature.group' version='0.7.10' singleton='false'>
       <update id='org.modelica.mdt.feature.group' range='[0.0.0,0.7.10)' severity='0'/>
@@ -1225,43 +1405,4 @@
       </copyright>
     </unit>
-    <unit id='org.modelica.mdt.breakpoint' version='0.7.10'>
-      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.10)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
-        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
-      </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.10'/>
-        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.10'/>
-        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='12'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.10'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.10
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
     <unit id='org.modelica.mdt.feature.jar' version='0.7.7'>
       <properties size='4'>
@@ -1480,4 +1621,49 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.debug.ui' version='0.7.25'>
+      <update id='org.modelica.mdt.debug.ui' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='MDT Debug UI Plugin'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University'/>
+      </properties>
+      <provides size='9'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.debug.ui' version='0.7.25'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.debug.ui' version='0.7.25'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.ui' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.ui.breakpoints' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.ui.launcher' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.ui.presentation' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.ui.shortcuts' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.ui.views' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='14'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.ui' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.debug.ui; singleton:=true&#xA;Bundle-Version: 0.7.25
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.omc' version='0.7.17'>
       <update id='org.modelica.mdt.omc' range='[0.0.0,0.7.17)' severity='0'/>
@@ -1592,4 +1778,51 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.debug.core' version='0.7.25'>
+      <update id='org.modelica.mdt.debug.core' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='MDT Debug Core Plugin'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University'/>
+      </properties>
+      <provides size='19'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.debug.core' version='0.7.25'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.debug.core' version='0.7.25'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.core.breakpoints' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.core.launcher' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.core.model' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.core.sourcelookup' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.launcher' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.mi' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.mi.command' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.mi.event' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.mi.output' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.mi.pty' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.model' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.model.stack' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.model.thread' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.debug.gdb.core.sourcelookup' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='6'>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.variables' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.debug.core' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.debug.core; singleton:=true&#xA;Bundle-Version: 0.7.25
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.feature.jar' version='0.7.15'>
       <properties size='4'>
@@ -1626,4 +1859,100 @@
         Copyright (c) 2005-2011, &#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköpings University (LiU).
       </copyright>
+    </unit>
+    <unit id='org.modelica.mdt.ui' version='0.7.25'>
+      <update id='org.modelica.mdt.ui' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Modelica Development Tooling UI'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University'/>
+      </properties>
+      <provides size='16'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.ui' version='0.7.25'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.ui' version='0.7.25'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.actions' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.assist' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.console' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.constants' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.editor' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.filters' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.hover' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.preferences' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.text' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.util' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.view' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.ui.wizards' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='19'>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.console' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.navigator' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.variables' range='3.2.100'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.expressions' range='3.4.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ltk.core.refactoring' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' range='0.0.0'/>
+        <required namespace='java.package' name='org.eclipse.ltk.core.refactoring.participants' range='0.0.0'/>
+        <required namespace='java.package' name='org.eclipse.ltk.ui.refactoring' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.ui' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.ui; singleton:=true&#xA;Bundle-Version: 0.7.25
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='org.modelica.mdt.breakpoint' version='0.7.15'>
+      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.15)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
+        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.15'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.15'/>
+        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.15'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.15
+          </instruction>
+        </instructions>
+      </touchpointData>
     </unit>
     <unit id='org.modelica.mdt.feature.group' version='0.7.13' singleton='false'>
@@ -1661,43 +1990,4 @@
         Copyright (c) 2005-2011, &#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköpings University (LiU).
       </copyright>
-    </unit>
-    <unit id='org.modelica.mdt.breakpoint' version='0.7.15'>
-      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.15)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
-        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
-      </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.15'/>
-        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.15'/>
-        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='12'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.15'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.15
-          </instruction>
-        </instructions>
-      </touchpointData>
     </unit>
     <unit id='org.modelica.mdt.debug.core' version='0.7.7'>
@@ -2043,4 +2333,43 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.breakpoint' version='0.7.16'>
+      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.16)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
+        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.16'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.16'/>
+        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.16'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.16
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.feature.group' version='0.7.12' singleton='false'>
       <update id='org.modelica.mdt.feature.group' range='[0.0.0,0.7.12)' severity='0'/>
@@ -2078,43 +2407,4 @@
       </copyright>
     </unit>
-    <unit id='org.modelica.mdt.breakpoint' version='0.7.16'>
-      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.16)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
-        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
-      </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.16'/>
-        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.16'/>
-        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='12'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.16'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.16
-          </instruction>
-        </instructions>
-      </touchpointData>
-    </unit>
     <unit id='org.modelica.mdt.omc' version='0.7.19'>
       <update id='org.modelica.mdt.omc' range='[0.0.0,0.7.19)' severity='0'/>
@@ -2271,4 +2561,43 @@
           <instruction key='manifest'>
             Bundle-SymbolicName: org.modelica.mdt.debug.ui; singleton:=true&#xA;Bundle-Version: 0.7.23
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
+    <unit id='org.modelica.mdt.breakpoint' version='0.7.13'>
+      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.13)' severity='0'/>
+      <properties size='3'>
+        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
+        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
+      </properties>
+      <provides size='4'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.13'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.13'/>
+        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='12'>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.13'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.13
           </instruction>
         </instructions>
@@ -2309,43 +2638,4 @@
         Copyright (c) 2005-2011, &#xA;Open Source Modelica Consortium (OSMC),&#xA;Programming Environments Laboratory (PELAB),&#xA;Department of Computer and Information Science (IDA), &#xA;Linköpings University (LiU).
       </copyright>
-    </unit>
-    <unit id='org.modelica.mdt.breakpoint' version='0.7.13'>
-      <update id='org.modelica.mdt.breakpoint' range='[0.0.0,0.7.13)' severity='0'/>
-      <properties size='3'>
-        <property name='org.eclipse.equinox.p2.name' value='Breakpoint'/>
-        <property name='org.eclipse.equinox.p2.provider' value='Adeel Asghar [adeel.asghar@liu.se] @ PELAB, Linkoping University'/>
-        <property name='org.eclipse.equinox.p2.bundle.localization' value='plugin'/>
-      </properties>
-      <provides size='4'>
-        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.breakpoint' version='0.7.13'/>
-        <provided namespace='osgi.bundle' name='org.modelica.mdt.breakpoint' version='0.7.13'/>
-        <provided namespace='java.package' name='org.modelica.mdt.breakpoint' version='0.0.0'/>
-        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
-      </provides>
-      <requires size='12'>
-        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.debug.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.views' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.ide' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.workbench.texteditor' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.debug.core' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.eclipse.ui.editors' range='0.0.0'/>
-        <required namespace='osgi.bundle' name='org.modelica.mdt.core' range='0.0.0'/>
-      </requires>
-      <artifacts size='1'>
-        <artifact classifier='osgi.bundle' id='org.modelica.mdt.breakpoint' version='0.7.13'/>
-      </artifacts>
-      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
-      <touchpointData size='1'>
-        <instructions size='1'>
-          <instruction key='manifest'>
-            Bundle-SymbolicName: org.modelica.mdt.breakpoint; singleton:=true&#xA;Bundle-Version: 0.7.13
-          </instruction>
-        </instructions>
-      </touchpointData>
     </unit>
     <unit id='org.modelica.mdt.debug.core' version='0.7.9'>
@@ -4401,4 +4691,37 @@
       </touchpointData>
     </unit>
+    <unit id='org.modelica.mdt.core' version='0.7.25'>
+      <update id='org.modelica.mdt.core' range='[0.0.0,0.7.25)' severity='0'/>
+      <properties size='2'>
+        <property name='org.eclipse.equinox.p2.name' value='Modelica Development Tooling'/>
+        <property name='org.eclipse.equinox.p2.provider' value='Adrian Pop [Adrian.Pop@liu.se] @ OSMC, Linkoping University'/>
+      </properties>
+      <provides size='7'>
+        <provided namespace='org.eclipse.equinox.p2.iu' name='org.modelica.mdt.core' version='0.7.25'/>
+        <provided namespace='osgi.bundle' name='org.modelica.mdt.core' version='0.7.25'/>
+        <provided namespace='java.package' name='org.modelica.mdt.core' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.core.compiler' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.core.preferences' version='0.0.0'/>
+        <provided namespace='java.package' name='org.modelica.mdt.internal.core' version='0.0.0'/>
+        <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
+      </provides>
+      <requires size='4'>
+        <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
+        <required namespace='osgi.bundle' name='org.eclipse.jface.text' range='0.0.0'/>
+      </requires>
+      <artifacts size='1'>
+        <artifact classifier='osgi.bundle' id='org.modelica.mdt.core' version='0.7.25'/>
+      </artifacts>
+      <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
+      <touchpointData size='1'>
+        <instructions size='1'>
+          <instruction key='manifest'>
+            Bundle-SymbolicName: org.modelica.mdt.core; singleton:=true&#xA;Bundle-Version: 0.7.25
+          </instruction>
+        </instructions>
+      </touchpointData>
+    </unit>
     <unit id='org.modelica.mdt.core' version='0.7.11'>
       <update id='org.modelica.mdt.core' range='[0.0.0,0.7.11)' severity='0'/>
Index: trunk/org.modelica.mdt.site/site.xml
===================================================================
--- trunk/org.modelica.mdt.site/site.xml	(revision 1512)
+++ trunk/org.modelica.mdt.site/site.xml	(revision 1513)
@@ -112,4 +112,7 @@
     <category name="modelica"/>
   </feature>
+  <feature url="features/org.modelica.mdt_0.7.25.jar" id="org.modelica.mdt" version="0.7.25">
+    <category name="modelica"/>
+  </feature>
   <category-def name="modelica" label="Modelica and MetaModelica Tools">
       <description>
Index: trunk/org.modelica.mdt.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.modelica.mdt.ui/META-INF/MANIFEST.MF	(revision 1512)
+++ trunk/org.modelica.mdt.ui/META-INF/MANIFEST.MF	(revision 1513)
@@ -3,5 +3,5 @@
 Bundle-Name: Modelica Development Tooling UI
 Bundle-SymbolicName: org.modelica.mdt.ui; singleton:=true
-Bundle-Version: 0.7.24
+Bundle-Version: 0.7.25
 Bundle-Activator: org.modelica.mdt.ui.UIPlugin
 Require-Bundle: org.modelica.mdt.core,
