org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF · 12a4a9879282bd7f7665ec4a200a8e3cc64b54c2 · Eclipse Projects / The Eclipse Integrated Computational Environment / ice

Merge remote-tracking branch 'origin/next' into jay/UIRefactor · 13966a13

Jay Jay Billings authored Feb 12, 2016



Conflicts:
	.DS_Store
	org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEGeometryPage.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java
	org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/MeshElementTreeView.java
	org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEGeometry.java
	org.eclipse.ice.repository/ice.product_linux.launch
	org.eclipse.ice.tablecomponenttester/META-INF/MANIFEST.MF

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>

13966a13