Merge remote-tracking branch 'origin/master' into jay/reflectivity · eclipse/ice@3af10a6 · GitHub

This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'origin/master' into jay/reflectivity

Browse files

Conflicts:
	src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java

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

Loading branch information

Jay Jay Billings committed Apr 15, 2015

1 parent c1004dd commit 3af10a6