Richard Peter ffe0b35085 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: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]] Former-commit-id: 930ff50fb8 Former-commit-id: 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf] Former-commit-id: 76f11f00ae		2013-05-21 12:11:21 -05:00
..
icons	13.3.1-6 baseline	2013-03-12 08:35:45 -05:00
localization/ncep/pgen	13.4.1-10 baseline	2013-05-20 10:52:47 -04:00
META-INF	13.4.1-10 baseline	2013-05-20 10:52:47 -04:00
schema	13.4.1-10 baseline	2013-05-20 10:52:47 -04:00
src	Merge branch 'omaha_13.4.1' (13.4.1-11) into development	2013-05-21 12:11:21 -05:00
unit-test/gov/noaa/nws/ncep/ui/pgen	12.5.1-15 baseline	2012-06-08 13:39:48 -05:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Issue #181	2012-01-26 09:26:07 -06:00
gov.noaa.nws.ncep.ui.pgen.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
plugin.xml	13.4.1-10 baseline	2013-05-20 10:52:47 -04:00