Richard Peter 0e25ae35c1 Merge branch 'omaha_14.2.1' (14.2.1-8) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75 Former-commit-id: a47eaa9af45db41391fe46e36ec0793f70d06ad6		2014-02-27 15:18:26 -06:00
..
.settings	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
META-INF	14.1.1-8 baseline	2013-11-13 12:32:17 -05:00
res/spring	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
resources	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
src/com/raytheon/uf/edex/archive	14.1.1-18 baseline	2014-02-11 15:52:50 -05:00
utility/common_static/base	Merge branch 'master_14.1.1' into solutions	2014-01-13 17:45:20 -06:00
.classpath	14.1.1-7 baseline	2013-11-06 14:16:14 -05:00
.project	13.5.1-1 baseline	2013-06-10 15:17:17 -04: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.uf.edex.archive.ecl	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00