Stephen Gilbert da55d4cf8d 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: 0911e5a4ef [formerly 09ae4e1dc5063df9f94d802f2630632d4c856fff] Former-commit-id: 33c9f191b4		2014-12-16 13:06:21 -05:00
..
common_static/base	VLab Issue #4078 - Initial check in for Real Time Kp Monitor	2014-10-10 08:58:46 -04:00
edex_static/base/distribution	Omaha #2733 restored geomag distribution registration	2014-05-22 09:13:52 -05:00