[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[ice-build] [eclipse/ice] a8482e: Adding EGit plugins so that imported project is co...
|
Branch: refs/heads/andrew/proteus
Home: https://github.com/eclipse/ice
Commit: a8482e6dd90468297424c771ba34f88db3b0e87a
https://github.com/eclipse/ice/commit/a8482e6dd90468297424c771ba34f88db3b0e87a
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M org.eclipse.ice.target.kepler/kepler_rcp.target
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
Log Message:
-----------
Adding EGit plugins so that imported project is connected to the
Git/Team perspective/context menu.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 3f2f330da2f257cb481640f08614985ea7cd3fe8
https://github.com/eclipse/ice/commit/3f2f330da2f257cb481640f08614985ea7cd3fe8
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-20 (Mon, 20 Apr 2015)
Changed paths:
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
M src/org.eclipse.ice.client.widgets.moose/plugin.xml
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MoosePreferencePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourceView.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/LabelContribution.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/SpinnerContribution.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/viz/service/IPlot.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSELauncher.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSELauncherTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into
mccaskey/moose_fork_stork
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 5c91b8098695eeb32f56e512a157f2403cb695fa
https://github.com/eclipse/ice/commit/5c91b8098695eeb32f56e512a157f2403cb695fa
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M src/org.eclipse.ice.client.widgets.moose/plugin.xml
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/NewKernelHandler.java
Log Message:
-----------
Adding new extensions and unimplemented command handler to create a new
MOOSE Kernel class by right clicking a 'fork the stork' moose app and
selecting New > New MOOSE Kernel from the context menu.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 471c039eb54a81b08f670c9b81e1509c47fff67c
https://github.com/eclipse/ice/commit/471c039eb54a81b08f670c9b81e1509c47fff67c
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-21 (Tue, 21 Apr 2015)
Changed paths:
M README.md
M org.eclipse.ice.build/pom.xml
M org.eclipse.ice.target.kepler/kepler_rcp.target
A repository/org.eclipse.ice.repository/ice.macosx_product.launch
M repository/org.eclipse.ice.repository/ice.product
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
M src/org.eclipse.ice.client.widgets.moose/plugin.xml
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MOOSEFormEditor.java
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/NewKernelHandler.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/DataComponentComposite.java
A src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ElementSourceDialog.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/EntryComposite.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ExtraInfoDialog.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEFormEditor.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICEResourcePage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ICETableComponentSectionPart.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/ListComponentSectionPage.java
M src/org.eclipse.ice.client.widgets/src/org/eclipse/ice/client/widgets/PlotGridComposite.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/IElementSource.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/ICEObject/ListComponent.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/AdaptiveTreeComposite.java
M src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/Material.java
M src/org.eclipse.ice.io/META-INF/MANIFEST.MF
A src/org.eclipse.ice.io/src/org/eclipse/ice/io/csv/CSVReader.java
M src/org.eclipse.ice.item/META-INF/MANIFEST.MF
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractItemBuilder.java
R src/org.eclipse.ice.item/src/org/eclipse/ice/item/AbstractModelBuilder.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/Item.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/action/JobLaunchAction.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/jobLauncher/JobLauncher.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/AbstractModelBuilder.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/model/Model.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/nuclear/MOOSEModel.java
M src/org.eclipse.ice.item/src/org/eclipse/ice/item/utilities/moose/Block.java
M src/org.eclipse.ice.materials/META-INF/MANIFEST.MF
M src/org.eclipse.ice.materials/data/defaultMatDB.xml
M src/org.eclipse.ice.materials/data/userMatDB.xml
M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/IMaterialsDatabase.java
A src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/MaterialWritableTableFormat.java
M src/org.eclipse.ice.materials/src/org/eclipse/ice/materials/XMLMaterialsDatabase.java
M src/org.eclipse.ice.reflectivity/META-INF/MANIFEST.MF
M src/org.eclipse.ice.reflectivity/OSGI-INF/ReflectivityModelComponent.xml
A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityCalculator.java
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModel.java
M src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityModelBuilder.java
A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ReflectivityProfile.java
A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/ScatteringDensityProfile.java
A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Slab.java
A src/org.eclipse.ice.reflectivity/src/org/eclipse/ice/reflectivity/Tile.java
M src/org.eclipse.ice.viz.service.paraview/META-INF/MANIFEST.MF
A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/connections/paraview/ParaViewConnectionAdapter.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlot.java
A src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPlotRender.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewPreferencePage.java
M src/org.eclipse.ice.viz.service.paraview/src/org/eclipse/ice/viz/service/paraview/ParaViewVizService.java
M src/org.eclipse.ice.viz.service.visit/META-INF/MANIFEST.MF
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionAdapter.java
R src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionManager.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/connections/visit/VisItConnectionTable.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlot.java
A src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPlotRender.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItPreferencePage.java
M src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItVizService.java
R src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/actions/ImportLocalFileAction.java
M src/org.eclipse.ice.viz.service/META-INF/MANIFEST.MF
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/AbstractVizPreferencePage.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/MultiPlot.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/PlotRender.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/VizPreferencePage.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionAdapter.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionManager.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlot.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionPlotRender.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/ConnectionTable.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionAdapter.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/IConnectionClient.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/connections/Launcher.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
A src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/preferences/VizConnectionPreferencePage.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVPlotEditor.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/PlotProvider.java
M tests/org.eclipse.ice.client.test/src/org/eclipse/ice/client/test/ItemProcessorTester.java
M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/ListComponentTester.java
M tests/org.eclipse.ice.datastructures.test/src/org/eclipse/ice/datastructures/test/MaterialTester.java
M tests/org.eclipse.ice.io.test/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.io.test/src/org/eclipse/ice/io/csv/test/CSVReaderTester.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractItemBuilderTester.java
A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/AbstractModelBuilderTester.java
A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeMaterialsDatabase.java
A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModel.java
A tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/FakeModelBuilder.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/TestJobLauncher.java
M tests/org.eclipse.ice.item.test/src/org/eclipse/ice/item/test/nuclear/MOOSEModelTester.java
M tests/org.eclipse.ice.materials.test/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/MaterialWritableTableFormatTester.java
M tests/org.eclipse.ice.materials.test/src/org/eclipse/ice/materials/test/XMLMaterialDatabaseTester.java
M tests/org.eclipse.ice.reflectivity.test/META-INF/MANIFEST.MF
A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityCalculatorTester.java
A tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelBuilderTester.java
M tests/org.eclipse.ice.reflectivity.test/src/org/eclipse/ice/reflectivity/test/ReflectivityModelTester.java
M tests/org.eclipse.ice.viz.service.test/src/org/eclipse/ice/viz/service/test/CSVPlotTester.java
M tests/org.eclipse.ice.viz.service.visit.test/src/org/eclipse/ice/viz/service/visit/test/VisItVizServiceTester.java
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotProviderTester.java
Log Message:
-----------
Adding code to update the new moose project's include paths, indexer
still not working though. Started on the new kernel handler.
Merge remote-tracking branch 'origin/master' into
mccaskey/moose_fork_stork
Conflicts:
org.eclipse.ice.target.kepler/kepler_rcp.target
repository/org.eclipse.ice.repository/ice.product.launch
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 81bb57d483ed2263144fef8eb3cb9b0aa00487e8
https://github.com/eclipse/ice/commit/81bb57d483ed2263144fef8eb3cb9b0aa00487e8
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M org.eclipse.ice.target.kepler/kepler_rcp.target
M src/org.eclipse.ice.client.widgets.moose/.classpath
M src/org.eclipse.ice.client.widgets.moose/.settings/org.eclipse.jdt.core.prefs
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
Log Message:
-----------
Committing work done on ForkStorkHandler to setup include paths for the
new C++ project.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: eb3a4d26cd5243c49ffdf97ae5febdcd04d8a0d6
https://github.com/eclipse/ice/commit/eb3a4d26cd5243c49ffdf97ae5febdcd04d8a0d6
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M src/org.eclipse.ice.core/.classpath
M src/org.eclipse.ice.core/.settings/org.eclipse.jdt.core.prefs
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/BasicAuthSecuredContext.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
Log Message:
-----------
Committing ComponentContext NullPointerException fix to the Core. Added
private startHttpService that creates the actual http connection, and
invoked it from the start method. Tested this with the new python
connection script.
Also cleaned up all the old UML generated stuff.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: bdb4066159fb1afa2d97d1d1ae3f2db44e267f9a
https://github.com/eclipse/ice/commit/bdb4066159fb1afa2d97d1d1ae3f2db44e267f9a
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M features/org.eclipse.ice.feature/feature.xml
M repository/org.eclipse.ice.repository/ice.macosx_product.launch
M repository/org.eclipse.ice.repository/ice.product
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.core/META-INF/MANIFEST.MF
Log Message:
-----------
Fixing org.eclipse.ice.core build error, forgot to change the min exec
env to Java 1.7 since I added a multi-exception catch statement.
Removed a few test bundles from the launch configurations.
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 503aac7e6a8b69671716e21b2384083e8f0f95a1
https://github.com/eclipse/ice/commit/503aac7e6a8b69671716e21b2384083e8f0f95a1
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M features/org.eclipse.ice.feature/feature.xml
M repository/org.eclipse.ice.repository/ice.product
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
M src/org.eclipse.ice.core/.classpath
M src/org.eclipse.ice.core/.settings/org.eclipse.jdt.core.prefs
M src/org.eclipse.ice.core/META-INF/MANIFEST.MF
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/BasicAuthSecuredContext.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
M src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlot.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataProvider.java
M src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/plotviewer/CSVDataTableViewer.java
M tests/org.eclipse.ice.viz.test/src/org/eclipse/ice/viz/plotviewer/test/PlotTreeContentProviderTester.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into
mccaskey/moose_fork_stork
Conflicts:
repository/org.eclipse.ice.repository/ice.macosx_product.launch
repository/org.eclipse.ice.repository/ice.product.launch
src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: 1d3d48f29c48b2b558630189a721a610d356c435
https://github.com/eclipse/ice/commit/1d3d48f29c48b2b558630189a721a610d356c435
Author: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M org.eclipse.ice.target.kepler/kepler_rcp.target
M repository/org.eclipse.ice.repository/ice.macosx_product.launch
M repository/org.eclipse.ice.repository/ice.product.launch
M src/org.eclipse.ice.client.widgets.moose/.classpath
M src/org.eclipse.ice.client.widgets.moose/.settings/org.eclipse.jdt.core.prefs
M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
M src/org.eclipse.ice.client.widgets.moose/plugin.xml
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkWizard.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkWizardPage.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MoosePreferencePage.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/NewKernelHandler.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
Log Message:
-----------
Merging Fork the Stork work into master.
Merge remote-tracking branch 'origin/mccaskey/moose_fork_stork'
Signed-off-by: Alex McCaskey <mccaskeyaj@xxxxxxxx>
Commit: d9da5dbbbcaa952e523604bef66ff82f898e7dbc
https://github.com/eclipse/ice/commit/d9da5dbbbcaa952e523604bef66ff82f898e7dbc
Author: arbennett <bennettar@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M features/org.eclipse.ice.feature/feature.xml
M repository/org.eclipse.ice.repository/ice.macosx_product.launch
M repository/org.eclipse.ice.repository/ice.product
M src/org.eclipse.ice.client.widgets.moose/.classpath
M src/org.eclipse.ice.client.widgets.moose/.settings/org.eclipse.jdt.core.prefs
M src/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
M src/org.eclipse.ice.client.widgets.moose/plugin.xml
M src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/ForkStorkHandler.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/MoosePreferencePage.java
A src/org.eclipse.ice.client.widgets.moose/src/org/eclipse/ice/client/widgets/moose/NewKernelHandler.java
M src/org.eclipse.ice.core/.classpath
M src/org.eclipse.ice.core/.settings/org.eclipse.jdt.core.prefs
M src/org.eclipse.ice.core/META-INF/MANIFEST.MF
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/iCore/ICore.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/BasicAuthSecuredContext.java
M src/org.eclipse.ice.core/src/org/eclipse/ice/core/internal/Core.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into andrew/proteus
Conflicts:
org.eclipse.ice.target.kepler/kepler_rcp.target
repository/org.eclipse.ice.repository/ice.product.launch
Signed-off-by: arbennett <bennettar@xxxxxxxx>
Commit: 7dce71c492c39a4bcc18716fc9fc9ef1362c8271
https://github.com/eclipse/ice/commit/7dce71c492c39a4bcc18716fc9fc9ef1362c8271
Author: arbennett <bennettar@xxxxxxxx>
Date: 2015-04-22 (Wed, 22 Apr 2015)
Changed paths:
M org.eclipse.ice.target.kepler/kepler_rcp.target
M repository/org.eclipse.ice.repository/ice.product.launch
Log Message:
-----------
Fixing product launcher & kepler target to be in line with master.
Signed-off-by: arbennett <bennettar@xxxxxxxx>
Compare: https://github.com/eclipse/ice/compare/5bace84e9279...7dce71c492c3
