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	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #2791 Move DataSource/DataDestination to its own project, add DataFilter.	2014-03-07 18:15:32 -06:00
res/spring	Merge "Issue #2862 Implements locks on case creation." into development	2014-04-14 13:28:26 -05:00
src/com/raytheon/uf/edex/database	Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1	2014-05-05 12:15:14 -05:00
utility/common_static/base/purge	12.12.1-1 baseline	2012-11-07 12:41:20 -06:00
.classpath	13.1.2-2 baseline	2013-01-06 14:32:24 -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.uf.edex.database.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00