Stephen Gilbert 0911e5a4ef 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: 09ae4e1dc5063df9f94d802f2630632d4c856fff		2014-12-16 13:06:21 -05:00
..
com/raytheon	Omaha #3365 Realign AWIPS2_baseline tests	2014-09-30 12:53:20 -05:00
gov/noaa/nws/ncep	VLab Issue #4001 - Fix Ncuair decoder for dropsondes	2014-12-01 16:06:41 -05:00