Steve Harris 61af779433 Merge branch 'omaha_14.2.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml Former-commit-id: 873bd6b889 [formerly 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]] Former-commit-id: f60aba35d6 Former-commit-id: 708485427e		2014-03-07 15:43:40 -06: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	Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06: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	Issue #2713 Update path for MADIS-Harvester.xml	2014-03-03 08:46:37 -06: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