Steve Harris d040b14742 Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge ... Conflicts: ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java All of these were 'self-resolved' when kdiff3 invoked Former-commit-id: d7f7c26582 [formerly 092efd6072] [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]] Former-commit-id: 31b3e87ffa Former-commit-id: 53d2822329 [formerly 98447412f8] Former-commit-id: 7ee04eb560		2012-05-09 13:19:47 -05:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
localization/menus/scan	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
META-INF	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
src/com/raytheon/uf/viz/monitor/scan	Issue #562: Rename QPFRecord getters and setters to match Java-naming	2012-04-27 12:43:04 -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	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.uf.viz.monitor.scan.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
config.xml	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
logoSCAN1.gif	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
plugin.xml	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
scan_loading.gif	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
working_scan.gif	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00