-Manifest-Version: 1.0
+vManifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Document Server
Bundle-SymbolicName: org.simantics.document.server;singleton:=true
org.simantics.modeling;bundle-version="1.1.1",
org.simantics.document.server.io;visibility:=reexport,
org.simantics.scl.db;bundle-version="0.1.3",
- org.slf4j.api
+ org.slf4j.api,
+<<<<<<< Upstream, based on branch 'private/antti_threads' of ssh://villberg@gerrit.simantics.org:29418/simantics/platform.git
+ org.simantics.threadlog
+=======
+ org.simantics.threadlog,
+ org.simantics.simulator.toolkit,
+ org.simantics.simulator.toolkit.db;bundle-version="1.0.0";visibility:=reexport
+>>>>>>> 82fa68e Generate parts of db client query code
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.simantics.document.server.Activator
Export-Package: org.simantics.document.server,