Brian.Dyke 9abb02ea8a Merge branch 'master_14.2.2' into master_14.3.1 CM-MERGE:14.2.2-17,-18,-19,-20,-21,-22,-23,-24 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java Former-commit-id: b209604e1f0d6e790980d0bc8f1760e38f448076		2014-08-04 13:10:13 -04:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
res/spring	Merged 1354 -5 and -6 into 1412 based on 1411-25	2014-04-04 12:57:32 -04:00
src/com/raytheon/edex/services	Issue #3372 make LocalizationStreamHandler thread safe	2014-07-14 09:18:16 -05:00
unit-test/com/raytheon/edex/services	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
utility/edex_static/base	Issue #2032 moving localization edex_static files to respective plugins, except colormaps	2013-07-18 17:20:27 -05:00
.classpath	Issue #1302 Address peer review comments for 5-Data_Delivery/development merge	2012-11-08 09:57:16 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Issue #2620 Made plugins include utility/resources folders in build.properties for deployment of precompiled jars. Cleaned up manifest versioning in base cots plugins to avoid possible ambiguity between eclipse plugins and repo plugins.	2014-01-06 17:03:45 -06:00
com.raytheon.edex.utilitysrv.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00