used git cherry-pick -m 1 879a2e0 Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline Conflicts: cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java* cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.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/images/GLImage.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java* cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java Conflicts: ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java Former-commit-id:4ec294b525
[formerly2ed7249613
] [formerly4ec294b525
[formerly2ed7249613
] [formerly7b75b781ad
[formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]] Former-commit-id:7b75b781ad
Former-commit-id:7c7fc97131
[formerly6dd3ee8809
] Former-commit-id:fd9e226b35
41 lines
1.4 KiB
Text
41 lines
1.4 KiB
Text
Manifest-Version: 1.0
|
|
Bundle-ManifestVersion: 2
|
|
Bundle-Name: OpenGL Rendering Plug-in
|
|
Bundle-SymbolicName: com.raytheon.viz.core.gl;singleton:=true
|
|
Bundle-Version: 1.12.1174.qualifier
|
|
Bundle-Activator: com.raytheon.viz.core.gl.Activator
|
|
Bundle-Vendor: Raytheon
|
|
Eclipse-RegisterBuddy: net.sf.ehcache
|
|
Eclipse-BuddyPolicy: ext, registered
|
|
Require-Bundle: org.eclipse.ui,
|
|
org.eclipse.core.runtime,
|
|
javax.media.opengl,
|
|
org.geotools,
|
|
javax.vecmath,
|
|
com.raytheon.edex.common,
|
|
com.raytheon.uf.common.colormap;bundle-version="1.0.0",
|
|
com.raytheon.uf.viz.core,
|
|
com.raytheon.uf.common.util;bundle-version="1.0.0",
|
|
com.raytheon.uf.viz.application;bundle-version="1.0.0",
|
|
javax.measure;bundle-version="1.0.0"
|
|
Bundle-ActivationPolicy: lazy
|
|
Export-Package: com.raytheon.viz.core.gl,
|
|
com.raytheon.viz.core.gl.dataformat,
|
|
com.raytheon.viz.core.gl.ext,
|
|
com.raytheon.viz.core.gl.glsl,
|
|
com.raytheon.viz.core.gl.images
|
|
Import-Package: com.raytheon.uf.common.status,
|
|
com.raytheon.uf.viz.core,
|
|
com.raytheon.uf.viz.core.data,
|
|
com.raytheon.uf.viz.core.data.resp,
|
|
com.raytheon.uf.viz.core.drawables,
|
|
com.raytheon.uf.viz.core.exception,
|
|
com.raytheon.uf.viz.core.geom,
|
|
com.raytheon.uf.viz.core.map,
|
|
com.raytheon.uf.viz.core.preferences,
|
|
com.raytheon.uf.viz.core.rsc,
|
|
com.raytheon.uf.viz.core.rsc.hdf5,
|
|
com.raytheon.uf.viz.core.status,
|
|
junit.framework,
|
|
org.junit
|
|
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
|