Commit e383f4d2 authored by Robert Smith's avatar Robert Smith
Browse files

Merge branch 'next' into UnifiedVizRefactor_NoReactor

Conflicts:
	org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
	org.eclipse.ice.client.widgets.reactoreditor.lwr/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets.reactoreditor.lwr/src/org/eclipse/ice/client/widgets/reactoreditor/lwr/PlantAnalysisView.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/GeometryTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ICEShapeTester.java
	org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MeshComponentTester.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/GeometryComponent.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEGeometry.java...
parents 132780b2 5b3deaa7
#Thu Dec 31 16:28:58 EST 2015
artifact.attached.p2metadata=C\:\\Users\\r8s\\Desktop\\ice unstable nightly 6\\workspace\\ice\\org.eclipse.ice.client.widgets.reactoreditor.grid.test\\target\\p2content.xml
artifact.main=C\:\\Users\\r8s\\Desktop\\ice unstable nightly 6\\workspace\\ice\\org.eclipse.ice.client.widgets.reactoreditor.grid.test\\target\\org.eclipse.ice.client.widgets.reactoreditor.grid.test-2.1.8.jar
artifact.attached.p2artifacts=C\:\\Users\\r8s\\Desktop\\ice unstable nightly 6\\workspace\\ice\\org.eclipse.ice.client.widgets.reactoreditor.grid.test\\target\\p2artifacts.xml
#Generated by Maven
#Thu Dec 31 16:28:57 EST 2015
version=2.1.8
groupId=ICE
artifactId=org.eclipse.ice.client.widgets.reactoreditor.grid.test
<?xml version='1.0' encoding='UTF-8'?>
<?artifactRepository version='1.1.0'?>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='org.eclipse.ice.client.widgets.reactoreditor.grid.test' version='2.1.8'>
<properties size='5'>
<property name='artifact.size' value='17399'/>
<property name='download.size' value='17399'/>
<property name='maven-groupId' value='ICE'/>
<property name='maven-artifactId' value='org.eclipse.ice.client.widgets.reactoreditor.grid.test'/>
<property name='maven-version' value='2.1.8'/>
</properties>
</artifact>
</artifacts>
<?xml version='1.0' encoding='UTF-8'?>
<units size='1'>
<unit id='org.eclipse.ice.client.widgets.reactoreditor.grid.test' version='2.1.8'>
<update id='org.eclipse.ice.client.widgets.reactoreditor.grid.test' range='[0.0.0,2.1.8)' severity='0'/>
<properties size='5'>
<property name='org.eclipse.equinox.p2.name' value='GridTester'/>
<property name='org.eclipse.equinox.p2.provider' value='Oak Ridge National Laboratory'/>
<property name='maven-groupId' value='ICE'/>
<property name='maven-artifactId' value='org.eclipse.ice.client.widgets.reactoreditor.grid.test'/>
<property name='maven-version' value='2.1.8'/>
</properties>
<provides size='3'>
<provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ice.client.widgets.reactoreditor.grid.test' version='2.1.8'/>
<provided namespace='osgi.bundle' name='org.eclipse.ice.client.widgets.reactoreditor.grid.test' version='2.1.8'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='6'>
<required namespace='osgi.bundle' name='org.junit' range='0.0.0'/>
<required namespace='osgi.bundle' name='org.eclipse.gef' range='3.9.0'/>
<required namespace='osgi.bundle' name='org.eclipse.jface' range='3.8.102'/>
<required namespace='java.package' name='org.eclipse.ice.client.widgets.reactoreditor.grid' range='0.0.0'/>
<required namespace='java.package' name='org.eclipse.ui' range='0.0.0'/>
<required namespace='java.package' name='org.osgi.framework' range='1.3.0'/>
</requires>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='org.eclipse.ice.client.widgets.reactoreditor.grid.test' version='2.1.8'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
Bundle-SymbolicName: org.eclipse.ice.client.widgets.reactoreditor.grid.test;singleton:=true&#xA;Bundle-Version: 2.1.8&#xA;
</instruction>
</instructions>
</touchpointData>
</unit>
</units>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="output" path="bin"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.ice.client.widgets.reactoreditor.grid</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
eclipse.preferences.version=1
pluginProject.extensions=false
resolve.requirebundle=false
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment