Merge remote-tracking branch 'origin/next' into jay/UIRefactor
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>
Too many changes to show.
To preserve performance only 20 of 1000+ files are displayed.
.DS_Store
deleted
100644 → 0
File deleted
docs/visualization/.project
0 → 100644
docs/visualization/.texlipse
0 → 100644