Richard Peter f6e6c3c531 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development ... Conflicts: edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c Former-commit-id: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]] Former-commit-id: b007d4a302 Former-commit-id: bf6e4c1f71 [formerly e03283ad4a] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]] Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f] Former-commit-id: ed15c2edcc		2013-06-24 18:51:56 -05:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
res/spring	Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml	2013-06-19 10:16:06 -05:00
src/com/raytheon/edex/plugin/gfe	Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1	2013-06-24 18:36:15 -05:00
test	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
utility	Merge branch 'master_13.5.1' into omaha_13.5.1	2013-06-17 15:25:32 -05:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.pydevproject	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
build.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.edex.plugin.gfe.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
plugin-deploy.groovy	Issue #1924 - standardize build.properties files	2013-06-13 16:04:18 -05:00