Resolved product file conflict.

diff --git a/taxeditor-application/TaxEditor.product b/taxeditor-application/TaxEditor.product
index c1a2befedb992ea27a83ead24cf58a81d8494543..ca4de5f1b1b3dfde481e3626f5d0b8ebbfdd7574 100644 (file)
--- a/taxeditor-application/TaxEditor.product
+++ b/taxeditor-application/TaxEditor.product
@@ -1,3 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<?pde version="3.4"?>\r
+\r
+<product name="%productName" id="eu.etaxonomy.taxeditor.application.TaxonomicEditor" application="eu.etaxonomy.taxeditor.application.application" version="2.0.0" useFeatures="true">\r
+\r
+   <aboutInfo>\r
+      <text>\r
+         %productBlurb\r
+      </text>\r
+   </aboutInfo>\r
+\r
+   <configIni use="default">\r
+   </configIni>\r
+\r
+   <launcherArgs>\r
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
+   </launcherArgs>\r
+\r
+   <windowImages i16="/taxeditor-application/icons/256color_16x16.gif" i32="/taxeditor-application/icons/256color_32x32.gif" i48="/taxeditor-application/icons/256color_48x48.gif"/>\r
+\r
+   <splash\r
+      startupProgressRect="5,447,366,15"\r
+      startupMessageRect="7,432,360,20"\r
+      startupForegroundColor="000000" />\r
+   <launcher name="TaxonomicEditor">\r
+      <solaris/>\r
+      <win useIco="false">\r
+         <bmp/>\r
+      </win>\r
+   </launcher>\r
+\r
+   <vm>\r
+   </vm>\r
+\r
+   <plugins>\r
+      <plugin id="com.ibm.icu"/>\r
+      <plugin id="eu.etaxonomy.cdmLibrary"/>\r
+      <plugin id="eu.etaxonomy.taxeditor.application"/>\r
+      <plugin id="eu.etaxonomy.taxeditor.editor"/>\r
+      <plugin id="eu.etaxonomy.taxeditor.navigation"/>\r
+      <plugin id="eu.etaxonomy.taxeditor.store"/>\r
+      <plugin id="org.eclipse.core.commands"/>\r
+      <plugin id="org.eclipse.core.contenttype"/>\r
+      <plugin id="org.eclipse.core.databinding"/>\r
+      <plugin id="org.eclipse.core.databinding.beans"/>\r
+      <plugin id="org.eclipse.core.expressions"/>\r
+      <plugin id="org.eclipse.core.filebuffers"/>\r
+      <plugin id="org.eclipse.core.filesystem"/>\r
+      <plugin id="org.eclipse.core.filesystem.win32.x86" fragment="true"/>\r
+      <plugin id="org.eclipse.core.jobs"/>\r
+      <plugin id="org.eclipse.core.resources"/>\r
+      <plugin id="org.eclipse.core.resources.compatibility" fragment="true"/>\r
+      <plugin id="org.eclipse.core.resources.win32.x86" fragment="true"/>\r
+      <plugin id="org.eclipse.core.runtime"/>\r
+      <plugin id="org.eclipse.core.runtime.compatibility.registry" fragment="true"/>\r
+      <plugin id="org.eclipse.equinox.app"/>\r
+      <plugin id="org.eclipse.equinox.common"/>\r
+      <plugin id="org.eclipse.equinox.preferences"/>\r
+      <plugin id="org.eclipse.equinox.registry"/>\r
+      <plugin id="org.eclipse.help"/>\r
+      <plugin id="org.eclipse.jface"/>\r
+      <plugin id="org.eclipse.jface.databinding"/>\r
+      <plugin id="org.eclipse.jface.text"/>\r
+      <plugin id="org.eclipse.osgi"/>\r
+      <plugin id="org.eclipse.pde.source"/>\r
+      <plugin id="org.eclipse.swt"/>\r
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>\r
+      <plugin id="org.eclipse.text"/>\r
+      <plugin id="org.eclipse.ui"/>\r
+      <plugin id="org.eclipse.ui.editors"/>\r
+      <plugin id="org.eclipse.ui.forms"/>\r
+      <plugin id="org.eclipse.ui.ide"/>\r
+      <plugin id="org.eclipse.ui.navigator"/>\r
+      <plugin id="org.eclipse.ui.navigator.resources"/>\r
+      <plugin id="org.eclipse.ui.views"/>\r
+      <plugin id="org.eclipse.ui.views.properties.tabbed"/>\r
+      <plugin id="org.eclipse.ui.win32" fragment="true"/>\r
+      <plugin id="org.eclipse.ui.workbench"/>\r
+      <plugin id="org.eclipse.ui.workbench.texteditor"/>\r
+      <plugin id="org.junit4"/>\r
+   </plugins>\r
+\r
+   <features>\r
+      <feature id="eu.etaxonomy.taxeditor" version="2.0.0.v20090617-1416"/>\r
+   </features>\r
+\r
+</product>\r
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.4"?>