02105701a0
Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java Former-commit-id:b0621d90bc[formerlyfd71e44f0f] [formerlya23cecdb26[formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]] Former-commit-id:a23cecdb26Former-commit-id:e96e95b565
15 lines
533 B
Text
15 lines
533 B
Text
Manifest-Version: 1.0
|
|
Bundle-ManifestVersion: 2
|
|
Bundle-Name: Ingestsrv Plug-in
|
|
Bundle-SymbolicName: com.raytheon.edex.ingestsrv
|
|
Bundle-Version: 1.12.1174.qualifier
|
|
Bundle-Vendor: RAYTHEON
|
|
Require-Bundle: com.raytheon.edex.common,
|
|
org.apache.commons.logging,
|
|
org.apache.commons.lang,
|
|
org.springframework;bundle-version="2.5.6"
|
|
Export-Package: com.raytheon.edex.services
|
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|
|
Import-Package: com.raytheon.uf.edex.core,
|
|
com.raytheon.uf.common.status,
|
|
com.raytheon.uf.edex.database.plugin
|