Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-06-12 20:08:41 +0000
committerslewis2014-06-12 20:08:41 +0000
commitd3dfa412d7f20ca4dc540922537be8e1f3dce094 (patch)
tree406c481459d946b563b6168187b7aba44fa18766 /compendium
parentc28a9bebcf78dc077f1313504035a9db3cecbcad (diff)
parente6a34a588cbfec3b900de463ae0568f1743d0203 (diff)
downloadorg.eclipse.ecf-424059.tar.gz
org.eclipse.ecf-424059.tar.xz
org.eclipse.ecf-424059.zip
Merge remote-tracking branch 'origin/master' into 424059424059
Conflicts: framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF merged manually by sbl Change-Id: If086dde4fffb137f44a48d183f6280f068c8eb17
Diffstat (limited to 'compendium')
-rw-r--r--compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties4
1 files changed, 2 insertions, 2 deletions
diff --git a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties
index e8fb76b71..6c3f3a9e6 100644
--- a/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties
+++ b/compendium/bundles/org.eclipse.ecf.osgi.services.distribution/plugin.properties
@@ -4,7 +4,7 @@
# the Eclipse Public License v1.0 which accompanies this distribution, and is
#
# Contributors:
-# EclipseSource - initial API and implementation
+# Composent, Inc. - initial API and implementation
#################################################################################
-pluginName=ECF OSGi R4.2 Compendium Distribution
+pluginName=ECF RemoteServiceAdmin Topology Manager
pluginProvider=Eclipse.org - ECF \ No newline at end of file

Back to the top