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 /tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde | |
| parent | c28a9bebcf78dc077f1313504035a9db3cecbcad (diff) | |
| parent | e6a34a588cbfec3b900de463ae0568f1743d0203 (diff) | |
| download | org.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 'tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde')
6 files changed, 1 insertions, 0 deletions
diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.gitignore b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.gitignore index 5e56e040e..167fb2c02 100644 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.gitignore +++ b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/.gitignore @@ -1 +1,2 @@ /bin +/bin diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/Activator.class b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/Activator.class Binary files differdeleted file mode 100644 index d954922c7..000000000 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/Activator.class +++ /dev/null diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Template.class b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Template.class Binary files differdeleted file mode 100644 index 8ff85daa9..000000000 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Template.class +++ /dev/null diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Wizard.class b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Wizard.class Binary files differdeleted file mode 100644 index 5572460e6..000000000 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceConsumerExample1Wizard.class +++ /dev/null diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Template.class b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Template.class Binary files differdeleted file mode 100644 index 277a08a89..000000000 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Template.class +++ /dev/null diff --git a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Wizard.class b/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Wizard.class Binary files differdeleted file mode 100644 index 29ebc04b0..000000000 --- a/tooling/plugins/org.eclipse.ecf.remoteservices.tooling.pde/bin/org/eclipse/ecf/remoteservices/internal/tooling/pde/RemoteServiceHostExample1Wizard.class +++ /dev/null |