xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
180 commits 31 branches 40 tags 3.8 GiB
Java 75.8%
Python 18%
HTML 4.5%
Shell 1.3%
PLpgSQL 0.1%
Find a file
Steve Harris 625cd4262c 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: 5e1b9319941eed516a08a135a2049c14bad77863
2012-04-19 11:11:02 -05:00
cave Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-04-19 11:11:02 -05:00
cots 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edexOsgi Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-04-19 11:11:02 -05:00
ldm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
nativeLib 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncep Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-04-19 11:11:02 -05:00
pythonPackages 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
RadarServer 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rpms 12.4.1-4 baseline 2012-04-18 15:18:16 -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