| commit | d3dfa412d7f20ca4dc540922537be8e1f3dce094 | [log] [tgz] |
|---|---|---|
| author | slewis <slewis@composent.com> | Thu Jun 12 13:08:41 2014 -0700 |
| committer | slewis <slewis@composent.com> | Thu Jun 12 13:08:41 2014 -0700 |
| tree | 406c481459d946b563b6168187b7aba44fa18766 | |
| parent | c28a9bebcf78dc077f1313504035a9db3cecbcad [diff] | |
| parent | e6a34a588cbfec3b900de463ae0568f1743d0203 [diff] |
Merge remote-tracking branch 'origin/master' into 424059 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