Steve Harris 69dc3d835b Merge branch 'omaha_14.2.1' into development ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java cave/com.raytheon.viz.product.awips/awips.product edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java Former-commit-id: 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90		2014-01-21 12:36:54 -06:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06: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
res/spring	Issue #1989 remove unused schemas	2013-05-29 16:19:28 -05:00
src/com/raytheon/uf/edex/pointdata	Merge branch 'omaha_14.2.1' into development	2014-01-21 12:36:54 -06:00
utility/edex_static/base/adaptivePlots	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -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	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.pointdata.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00