Brian.Dyke 278aab6b6f Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2) ... Conflicts: cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java 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.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java Former-commit-id: 64c3766ed570885a796f846b889d40413e8250c6		2014-04-30 12:57:09 -04:00
..
.settings	Issue #2097 Initial update for OGC services	2013-08-28 08:24:45 -05:00
META-INF	Issue #2097 Initial update for OGC services	2013-08-28 08:24:45 -05:00
res/spring	Issue #2939 Madis data mismatches	2014-03-24 08:27:12 -05:00
src/com/raytheon/uf/edex/plugin/madis/registry	Issue #2731 Fixed calendar conversion issuse with OGC	2014-01-22 15:18:18 -06:00
utility/common_static/base/datadelivery/harvester	Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)	2014-04-30 12:57:09 -04:00
.classpath	Issue #2097 Initial update for OGC services	2013-08-28 08:24:45 -05:00
.project	Issue #2097 Initial update for OGC services	2013-08-28 08:24:45 -05:00
build.properties	Issue #2097 Initial update for OGC services	2013-08-28 08:24:45 -05:00