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
..
edex/plugin	CM-MERGE:14.1.3-2,-3 into 14.2.2	2014-06-20 14:01:55 -04:00
rcm/coll	Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing	2013-07-25 14:59:01 -05:00
uf	Issue #2386 fixed spatial overlap rule application.	2014-02-25 09:22:08 -06:00
viz	Issue #2331 Fixed Topo retrieval for smartTools/procedures	2013-12-04 17:10:48 -06:00