Dave Hladky 333bf8b36d Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1 ... Conflicts: edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java Former-commit-id: 2e5ee5565d1847490e46c59866b14f77555e2a7e		2014-05-05 12:15:14 -05:00
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
icons	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
localization	Issue #2314 - Various fixes to the DD Notification Dialog	2013-09-04 15:20:20 -05:00
META-INF	Issue #2491 Bug fixes and clean up all remaining resource datas.	2013-10-29 17:35:55 -05:00
res/spring	Issue #2538 - Add AdhocSubscripionHander to SubscriptionHandler. Fix problem querying for adhoc subs.	2014-01-20 17:44:02 -06:00
src/com/raytheon/uf/viz/datadelivery	Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1	2014-05-05 12:15:14 -05:00
.classpath	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
.project	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
build.properties	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
com.raytheon.uf.viz.datadelivery.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00
plugin.xml	Issue #2391 - Add Data Delivery to product browser.	2013-09-20 08:38:35 -05:00