Steve Harris 16f5ff0979 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: 419c5f4aba [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3] Former-commit-id: b84dda5930		2014-06-20 14:01:55 -04:00
..
com/raytheon	CM-MERGE:14.1.3-2,-3 into 14.2.2	2014-06-20 14:01:55 -04:00
dods/dap	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
gov/noaa/nws/ncep	Issue #1726 change how swt is imported to tests, uncomment some tests that now work again	2013-08-05 12:13:15 -05:00
oasis/names/tc/ebxml/regrep/xsd/rim/v4	Issue #1829 Refactored EBXML registry objects	2013-12-05 10:20:24 -06:00