Mirror of Unidata's AWIPS2.

Steve Harris c6071e24c5 Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) ... 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 Former-commit-id: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]] Former-commit-id: 5cdda77afb Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6] Former-commit-id: 9845ef53f9		2012-03-30 09:50:48 -05:00
cave	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)	2012-03-30 09:50:48 -05:00
cots	Merge branch 'ss_sync' into 4-Thin_Client	2012-02-23 13:16:35 -06:00
cotsSource/org.apache.qpid	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
deltaScripts	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
edexOsgi	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)	2012-03-30 09:50:48 -05:00
ldm	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
localApps	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
localization	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
MHSEmulator	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
msi	Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client	2012-02-15 14:39:43 -06:00
nativeLib	12.3.1-10 baseline	2012-03-30 08:38:33 -05:00
ncep	Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)	2012-03-30 09:50:48 -05:00
pythonPackages	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
RadarServer	Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.	2012-01-20 11:37:38 -06:00
rpms	12.3.1-10 baseline	2012-03-30 08:38:33 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tools	Issue #228 change plots, grid icons, and radar icons	2012-02-01 12:45:56 -06:00
.gitignore	removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore	2012-02-23 12:45:50 -06:00