awips2/edexOsgi/com.raytheon.edex.plugin.gfe
Steve Harris f8496662a0 Merge branch 'master_14.2.1' into omaha_14.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java

Former-commit-id: 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 002b2492ac [formerly 5fcccbff1b] [formerly 454d557884] [formerly 9371eeeee0 [formerly 454d557884 [formerly cf9f10b2e5a4038dce0003a1c0a4f227335d5db4]]]]
Former-commit-id: 9371eeeee0
Former-commit-id: 9843517cb3 [formerly 7ea285c48b] [formerly 54d4fab62b427e6be3f978f3502c7e059e776520 [formerly 0ba307d616]]
Former-commit-id: 656727c4e55c34f4fb4a1128b81b68286b1e7757 [formerly b5f7f35ccb]
Former-commit-id: ccd2f6cdaa
2014-01-20 10:17:44 -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 Issue #2331 Fixed Topo retrieval for smartTools/procedures 2013-12-04 17:10:48 -06:00
src/com/raytheon/edex/plugin/gfe Merge branch 'master_14.2.1' into omaha_14.2.1 2014-01-20 10:17:44 -06:00
utility Merge branch 'master_14.2.1' into omaha_14.2.1 2014-01-20 10:17:44 -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