Steve Harris 873bd6b889 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	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager	2013-10-01 11:25: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/edex/plugin/gfe	Merge branch 'omaha_14.2.1' into development	2014-03-07 15:43:40 -06:00
utility	Merge branch 'omaha_14.2.1' (14.2.1-8) into development	2014-02-27 15:18:26 -06:00
.classpath	Issue #2208 moving edex unit tests to tests project	2013-07-25 12:29:46 -05:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.pydevproject	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
build.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.edex.plugin.gfe.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
plugin-deploy.groovy	Issue #1924 - standardize build.properties files	2013-06-13 16:04:18 -05:00