org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEMeshPage.java · e8f983d17e73a30de96644c32cdd7c494c1253a6 · Eclipse Projects / The Eclipse Integrated Computational Environment / ice

Merge branch 'Robert/UnifiedVizRefactor3' into · e8f983d1

Robert Smith authored Nov 20, 2015

Robert/UnifiedVizRefactor4

Conflicts:
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/MeshComponent.java
org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekReader.java
org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/scene/base/IGeometry.java
org.eclipse.ice.viz.service.mesh/META-INF/MANIFEST.MF
org.eclipse.ice.viz.service.mesh/src/org/eclipse/ice/viz/service/mesh/javafx/FXMeshVizService.java
org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/modeling/Face.java

Signed-off-by: Robert Smith <SmithRW@ornl.gov>

e8f983d1