Richard Peter 414ccec00e 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: 39fbaeed62 [formerly 79d3aa4e1a] [formerly 7bd6a07913] [formerly 7bd6a07913 [formerly 0e25ae35c1]] [formerly 1c150e6e8b [formerly 7bd6a07913 [formerly 0e25ae35c1] [formerly 1c150e6e8b [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]]] Former-commit-id: 1c150e6e8b Former-commit-id: d17e408d9521d3f82597dba5bf5fbdcd68561d6a [formerly 23c2e13876eeacd0c485ad3110006f8bd36a537c] [formerly 50a1b270c5 [formerly f13c86bc3e]] Former-commit-id: 50a1b270c5 Former-commit-id: 1d6e9816e0		2014-02-27 15:18:26 -06:00
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #2450 - Send notifications to Notification Center when subscriptions expire.	2013-11-06 12:23:09 -06:00
res	Issue #2686 Refactor of retrieval	2014-02-05 14:49:26 -06:00
resources	Issue #2469 Fixed default rules implementation	2014-02-24 13:06:52 -06:00
src/com/raytheon/uf/edex/datadelivery/retrieval	Issue #2469 Fixed default rules implementation	2014-02-24 13:06:52 -06:00
utility	Issue #1538 Federated registry fixes/modifications	2013-08-28 11:41:06 -05:00
.classpath	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
.project	13.2.1-2 baseline	2013-01-23 11:18:44 -05: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.datadelivery.retrieval.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00