Richard Peter 7966576f23 Merge branch 'omaha_13.4.1' (13.4.1-11) into development ... Conflicts: ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]] Former-commit-id: 930ff50fb8 Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf] Former-commit-id: 046de916fd		2013-05-21 12:11:21 -05:00
..
64	12.10.1-1 baseline	2012-09-04 12:07:27 -05:00
common	13.4.1-7 baseline	2013-05-13 12:58:10 -04:00
i386	Merge branch 'omaha_13.4.1' (13.4.1-11) into development	2013-05-21 12:11:21 -05:00
nightly	12.10.1-1 baseline	2012-09-04 12:07:27 -05:00
release	12.10.1-1 baseline	2012-09-04 12:07:27 -05:00
x86_64	13.4.1-7 baseline	2013-05-13 12:58:10 -04:00