Merge remote-tracking branch 'origin/master' into kasper/reflectivity/ui (dacc609a) · Commits · Daniel Bluhm / ice

Commit dacc609a authored 9 years ago by Jay Jay Billings

Merge remote-tracking branch 'origin/master' into kasper/reflectivity/ui


Conflicts:
	repository/org.eclipse.ice.repository/ice.product.launch

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

parents fc1f0540 cfa8ad5d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF 3 additions, 2 deletions

src/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/IUpdateableListener.java 8 additions, 0 deletions

...pse/ice/datastructures/ICEObject/IUpdateableListener.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/IComponentVisitor.java 3 additions, 12 deletions

...ce/datastructures/componentVisitor/IComponentVisitor.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/componentVisitor/SelectiveComponentVisitor.java 2 additions, 14 deletions

...tructures/componentVisitor/SelectiveComponentVisitor.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/GeometryComponent.java 26 additions, 29 deletions

...rg/eclipse/ice/datastructures/form/GeometryComponent.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/MeshComponent.java 534 additions, 0 deletions

...rc/org/eclipse/ice/datastructures/form/MeshComponent.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/TreeComposite.java 2 additions, 20 deletions

...rc/org/eclipse/ice/datastructures/form/TreeComposite.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/AbstractGeometry.java 0 additions, 192 deletions

...se/ice/datastructures/form/geometry/AbstractGeometry.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEGeometry.java 408 additions, 0 deletions

...eclipse/ice/datastructures/form/geometry/ICEGeometry.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/geometry/ICEShape.java 555 additions, 0 deletions

...rg/eclipse/ice/datastructures/form/geometry/ICEShape.java
src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/jaxbclassprovider/ICEJAXBClassProvider.java 1 addition, 1 deletion

...atastructures/jaxbclassprovider/ICEJAXBClassProvider.java
src/org.eclipse.ice.item/META-INF/MANIFEST.MF 2 additions, 2 deletions

src/org.eclipse.ice.item/META-INF/MANIFEST.MF
src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java 2 additions, 13 deletions

src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
src/org.eclipse.ice.item/src/org/eclipse/ice/item/geometry/GeometryEditor.java 2 additions, 2 deletions

...tem/src/org/eclipse/ice/item/geometry/GeometryEditor.java
src/org.eclipse.ice.kdd/META-INF/MANIFEST.MF 2 additions, 1 deletion

src/org.eclipse.ice.kdd/META-INF/MANIFEST.MF
src/org.eclipse.ice.mesh/META-INF/MANIFEST.MF 3 additions, 1 deletion

src/org.eclipse.ice.mesh/META-INF/MANIFEST.MF
src/org.eclipse.ice.mesh/src/org/eclipse/ice/mesh/editor/MeshEditor.java 1 addition, 1 deletion

....ice.mesh/src/org/eclipse/ice/mesh/editor/MeshEditor.java
src/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF 2 additions, 0 deletions

src/org.eclipse.ice.nek5000/META-INF/MANIFEST.MF
src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekModel.java 1 addition, 1 deletion

...pse.ice.nek5000/src/org/eclipse/ice/nek5000/NekModel.java
src/org.eclipse.ice.nek5000/src/org/eclipse/ice/nek5000/NekReader.java 6 additions, 6 deletions

...se.ice.nek5000/src/org/eclipse/ice/nek5000/NekReader.java

with 1563 additions and 297 deletions

Please register or to comment