Mirror of Unidata's AWIPS2.
Find a file
Stephen Gilbert b6b587a86f Merge branch 'ncep_14.2.2-n' into ncep_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.ncep.displays.feature/feature.xml
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK1minDao.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/dao/GeoMagK3hrDao.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/dao/NcUairToRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
	ncep/gov.noaa.nws.ncep.viz.gempak/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.gempak/src/gov/noaa/nws/ncep/viz/gempak/util/GempakGrid.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
	ncep/gov.noaa.nws.ncep.viz.rsc.ntrans/src/gov/noaa/nws/ncep/viz/rsc/ntrans/rsc/NtransResource.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/NcPlotResource2.java
	tests/.classpath

Former-commit-id: 33c9f191b4 [formerly 33c9f191b4 [formerly 09ae4e1dc5063df9f94d802f2630632d4c856fff]]
Former-commit-id: 0911e5a4ef
Former-commit-id: 93d92085ec
2014-12-16 13:06:21 -05:00
cave Merge "Omaha #3549 remove dead code" into omaha_14.4.1 2014-12-03 17:14:42 -06:00
deltaScripts Omaha #3788 Switch satellite_spatial.gid to a sequence. 2014-11-07 10:23:39 -06:00
edexOsgi Omaha #3549 remove jdt prefs for faster builds 2014-12-03 15:47:10 -06:00
javaUtilities Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1 2014-09-02 10:40:13 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Omaha #2991 Initial commit of QPID 0.28 and 0.30. Update native code to work with 0.30. 2014-11-10 08:27:28 -06:00
ncep Merge branch 'ncep_14.2.2-n' into ncep_14.4.1 2014-12-16 13:06:21 -05:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Omaha #3216 - Update Python to 2.7.8, move specific site-packages to AWIPS2_build 2014-11-18 13:48:19 -06:00
RadarServer Omaha #3502 removed common.convert from rcm feature 2014-08-11 09:56:53 -05:00
rpms Omaha #3216 - Increment pypies release number 2014-12-02 14:45:04 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'ncep_14.2.2-n' into ncep_14.4.1 2014-12-16 13:06:21 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00