Richard Peter c8484145dd 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 efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]] Former-commit-id: 930ff50fb8 Former-commit-id: ffe0b35085 [formerly 76f11f00ae] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]] Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd] Former-commit-id: 7966576f23		2013-05-21 12:11:21 -05:00
..
gov/noaa/nws/ncep/ui/pgen	Merge branch 'omaha_13.4.1' (13.4.1-11) into development	2013-05-21 12:11:21 -05:00
log4j.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00