Steve Harris c24108e75b Merge branch 'omaha_14.2.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml Former-commit-id: 51b755a476 [formerly 873bd6b889] [formerly f60aba35d6 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]] Former-commit-id: f60aba35d6 Former-commit-id: 708485427e		2014-03-07 15:43:40 -06:00
..
.settings	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
META-INF	Issue #2142 Got log4j out of edex.	2013-07-15 14:26:15 -05:00
res/spring	OB_14.1.1-20 baseline	2014-02-26 17:39:15 -05:00
resources	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
src/com/raytheon/uf/edex/event	13.5.1-4 baseline	2013-06-28 09:46:25 -04:00
.classpath	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
.project	13.1.2-2 baseline	2013-01-06 14:32:24 -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.event.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00