Steve Harris 7b27767d7e Merge branch 'omaha_13.3.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java Former-commit-id: 736bb45741 [formerly 140765a43e] [formerly 437a04011a [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]] Former-commit-id: 437a04011a Former-commit-id: 0b48e96314		2013-04-01 12:19:04 -05:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	Issue #1286 Fix bugs found during 1286 testing	2013-01-15 10:18:14 -06:00
res/spring	Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml	2012-11-12 16:46:21 -06:00
src/com/raytheon/uf/common/time	Merge branch 'omaha_13.3.1' into development	2013-04-01 12:19:04 -05:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.	2012-06-19 13:15:53 -05:00
com.raytheon.uf.common.time.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00