Commit 456a37e7 authored by Jay Jay Billings's avatar Jay Jay Billings
Browse files

Merge remote-tracking branch 'origin/next' into jay/UIRefactor



Conflicts:
	org.eclipse.ice.repository/ice.product
Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parents 5f8dbf30 3476f683
......@@ -425,4 +425,11 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ice.projectgeneration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment