Steve Harris a465718a0d 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: 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90] Former-commit-id: 24ab7cff49		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	13.2.1-6 baseline	2013-02-07 16:00:39 -06:00
res/spring	13.5.1-4 baseline	2013-06-28 09:46:25 -04:00
src/com/raytheon/uf/common/time	Issue #2615 Refactored Subscription valid time period calculation from BandwidthDaoUtil to	2014-01-10 16:37:09 -06:00
utility/common_static/base/python/time	Issue #2032 move build.edex's common-static files to appropriate plugins	2013-07-18 09:53:53 -05:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Issue #2032 move build.edex's common-static files to appropriate plugins	2013-07-18 09:53:53 -05:00
.pydevproject	Issue #2032 move build.edex's common-static files to appropriate plugins	2013-07-18 09:53:53 -05: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.common.time.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00