diff options
| author | slewis | 2014-06-12 20:08:41 +0000 |
|---|---|---|
| committer | slewis | 2014-06-12 20:08:41 +0000 |
| commit | d3dfa412d7f20ca4dc540922537be8e1f3dce094 (patch) | |
| tree | 406c481459d946b563b6168187b7aba44fa18766 /examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product | |
| parent | c28a9bebcf78dc077f1313504035a9db3cecbcad (diff) | |
| parent | e6a34a588cbfec3b900de463ae0568f1743d0203 (diff) | |
| download | org.eclipse.ecf-d3dfa412d7f20ca4dc540922537be8e1f3dce094.tar.gz org.eclipse.ecf-d3dfa412d7f20ca4dc540922537be8e1f3dce094.tar.xz org.eclipse.ecf-d3dfa412d7f20ca4dc540922537be8e1f3dce094.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 'examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product')
| -rw-r--r-- | examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product b/examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product index 38fdda515..497b45842 100644 --- a/examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product +++ b/examples/bundles/org.eclipse.ecf.example.clients/products/ChatRobot.product @@ -45,7 +45,7 @@ <plugin id="org.eclipse.ecf.provider.datashare"/> <plugin id="org.eclipse.ecf.provider.remoteservice"/> <plugin id="org.eclipse.ecf.provider.xmpp"/> - <plugin id="org.eclipse.ecf.remoteservice"/> + <plugin id="org.eclipse.ecf.remoteservice"/> <plugin id="org.eclipse.ecf.remoteservice.asyncproxy"/> <plugin id="org.eclipse.ecf.sharedobject"/> <plugin id="org.eclipse.ecf.ssl" fragment="true"/> <plugin id="org.eclipse.ecf.ui"/> |