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	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
META-INF	14.1.1-8 baseline	2013-11-13 12:32:17 -05:00
res/spring	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
resources	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
src/com/raytheon/uf/edex/archive	OB_14.1.1-19 baseline	2014-02-21 06:50:59 -05:00
utility/common_static/base	Merge branch 'master_14.1.1' into solutions	2014-01-13 17:45:20 -06:00
.classpath	14.1.1-7 baseline	2013-11-06 14:16:14 -05:00
.project	13.5.1-1 baseline	2013-06-10 15:17:17 -04: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.archive.ecl	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00