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
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