Steve Harris f60aba35d6 Merge branch 'omaha_14.2.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml Former-commit-id: 7d94859f45aaa3d732cbb25fc55348996cfe481c		2014-03-07 15:43:40 -06:00
..
.settings
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
src/com/raytheon/uf/edex/event	13.5.1-4 baseline	2013-06-28 09:46:25 -04:00
.classpath
.project
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