awips2/ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid
Richard Peter 8aa4b0025c 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: 8a78f99345016db3d38c0b846a8a6ccf77fb3e89
2013-05-21 12:11:21 -05:00
..
.settings Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
dgdriv_c Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 2013-01-14 17:38:38 -06:00
localization/ncep/resourceTemplates 13.2.1-5 baseline 2013-02-06 11:02:32 -06:00
META-INF Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
src/gov/noaa/nws/ncep/viz/rsc/ncgrid Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -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.viz.rsc.ncgrid.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