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.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/shapes/ShapeType.java 1 addition, 1 deletion

...rg/eclipse/ice/viz/service/geometry/shapes/ShapeType.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/shapes/Transformation.java 3 additions, 3 deletions

...lipse/ice/viz/service/geometry/shapes/Transformation.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/shapes/Tube.java 1 addition, 1 deletion

...src/org/eclipse/ice/viz/service/geometry/shapes/Tube.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ActionAddShape.java 11 additions, 11 deletions

...ipse/ice/viz/service/geometry/widgets/ActionAddShape.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ActionDeleteShape.java 6 additions, 6 deletions

...e/ice/viz/service/geometry/widgets/ActionDeleteShape.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ActionDuplicateShape.java 8 additions, 8 deletions

...ce/viz/service/geometry/widgets/ActionDuplicateShape.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ActionReplicateShape.java 13 additions, 13 deletions

...ce/viz/service/geometry/widgets/ActionReplicateShape.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/DropdownAction.java 1 addition, 1 deletion

...ipse/ice/viz/service/geometry/widgets/DropdownAction.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/RealSpinner.java 1 addition, 1 deletion

...eclipse/ice/viz/service/geometry/widgets/RealSpinner.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/RealSpinnerListener.java 2 additions, 1 deletion

...ice/viz/service/geometry/widgets/RealSpinnerListener.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/RenderShape.java 10 additions, 20 deletions

...eclipse/ice/viz/service/geometry/widgets/RenderShape.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ReplicateDialog.java 1 addition, 1 deletion

...pse/ice/viz/service/geometry/widgets/ReplicateDialog.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeMaterial.java 2 additions, 2 deletions

...lipse/ice/viz/service/geometry/widgets/ShapeMaterial.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTransient.java 3 additions, 2 deletions

...ipse/ice/viz/service/geometry/widgets/ShapeTransient.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTreeContentProvider.java 9 additions, 9 deletions

...iz/service/geometry/widgets/ShapeTreeContentProvider.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTreeDragListener.java 1 addition, 1 deletion

...e/viz/service/geometry/widgets/ShapeTreeDragListener.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTreeDropListener.java 1 addition, 1 deletion

...e/viz/service/geometry/widgets/ShapeTreeDropListener.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTreeLabelProvider.java 6 additions, 5 deletions

.../viz/service/geometry/widgets/ShapeTreeLabelProvider.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTreeSelectionListener.java 2 additions, 2 deletions

.../service/geometry/widgets/ShapeTreeSelectionListener.java
src/org.eclipse.ice.viz.service.geometry/src/org/eclipse/ice/viz/service/geometry/widgets/ShapeTreeView.java 9 additions, 9 deletions

...lipse/ice/viz/service/geometry/widgets/ShapeTreeView.java

with 91 additions and 98 deletions

Please register or to comment