Steve Harris 196f53e609 CM-MERGE:14.1.3-2,-3 into 14.2.2 ... Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14) Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java Former-commit-id: 16f5ff0979 [formerly b84dda5930] [formerly 16f5ff0979 [formerly b84dda5930] [formerly 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]] Former-commit-id: 419c5f4aba Former-commit-id: af06c5a890 [formerly 66d30e59a3] Former-commit-id: 935542914d		2014-06-20 14:01:55 -04:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
icons	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
localization	Issue #2310 Switch awipstools to load using bundles.	2013-09-04 16:05:09 -05:00
META-INF	Issue #2491 Remove uneeded ISerializableObject files.	2013-10-25 15:31:39 -05:00
src/com/raytheon/viz/awipstools	CM-MERGE:14.1.3-2,-3 into 14.2.2	2014-06-20 14:01:55 -04: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.viz.awipstools.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
plugin.xml	Issue #2310 Switch awipstools to load using bundles.	2013-09-04 16:05:09 -05:00