-
Jay Jay Billings authored
Conflicts: org.eclipse.ice.build/pom.xml org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/AbstractMeshControllerTester.java org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/EdgeControllerTester.java org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/MeshViewLauncher.java org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/TestMeshController.java org.eclipse.ice.client.widgets.rcp.test/src/org/eclipse/ice/client/widgets/mesh/test/VertexControllerTester.java org.eclipse.ice.client.widgets.rcp/OSGI-INF/MasterApplicationHolder.xml org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/AbstractView.java org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/CompositeAppState.java org.eclipse.ice.client.widgets.rcp/src/org/eclipse/ice/client/widgets/jme/Embedde...
270e3b46