Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 5a96582f16 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
cave Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -06:00
cots Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -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 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -06: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 Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory. 2012-02-17 11:09:13 -06:00
ncep Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -06: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 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -06: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 Issue #192 gitignore changes 2012-02-03 15:03:21 -06:00
.gitignore.orig Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP 2012-02-15 14:34:47 -06:00