| commit | 621e127b59928daafe75680b8780625df728fab0 | [log] [tgz] |
|---|---|---|
| author | slewis <slewis@composent.com> | Mon May 13 20:28:03 2013 -0700 |
| committer | slewis <slewis@composent.com> | Mon May 13 20:28:03 2013 -0700 |
| tree | a5cf18d132ac885769019a494cd113d72d5c9b97 | |
| parent | 425095a9d985b34d7ed1c86d638baa2ee3af8ab2 [diff] | |
| parent | 2e562af3a7d9c07d7b7fe827bc4dbc9199461701 [diff] |
Merge remote-tracking branch 'origin/master'
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java index a71a7a1..ca0c21a 100644 --- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java +++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java
@@ -323,4 +323,4 @@ public Dictionary getPropertiesForImportedConfigs(ContainerTypeDescription description, String[] importedConfigs, Dictionary exportedProperties) { return null; } -} \ No newline at end of file +}