Steve Harris 6a3f6359d6 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: 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 5ec1c01d3a [formerly 736bb45741] [formerly 140765a43e] [formerly 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]]] Former-commit-id: 437a04011a Former-commit-id: 47c7f66f2b [formerly 7b27767d7e] [formerly 0f6adbe76d6a5926e99d6caab1841fd3e7bd7349 [formerly 0b48e96314]] Former-commit-id: c1b945c05c86c82b34cd95220cf0b30459a58dc4 [formerly d0e61c59e8] Former-commit-id: ac6704c7e9		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
icons	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.	2013-03-20 14:10:52 -05:00
schema	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
src/com/raytheon/viz/ui	Merge branch 'omaha_13.3.1' into development	2013-04-01 12:19:04 -05:00
tests/com/raytheon/viz/ui	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06: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	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.viz.ui.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
config.xml	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
plugin.xml	Issue #1638 Made Map scales more generalized for use outside of D2D	2013-03-25 15:38:36 -05:00