Brian.Dyke 3524838f9f Merge branch 'master_14.2.2' into master_14.3.1 ... Merge (14.2.2-5 into 14.3.1-1) Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java Former-commit-id: f54d2c639a915db14f01f56a7fcc5841b60e1509		2014-04-25 11:06:11 -04:00
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #2789 Implement Version transformations	2014-04-03 09:44:14 -05:00
res/spring	Issue #1989 remove unused schemas	2013-05-29 16:19:28 -05:00
resources	Issue #1538 Fixes/cleanup to registry. Changed auditable event type sent time to DateTime instead of integer	2013-10-23 11:05:38 -05:00
src/com/raytheon/uf/common/registry	Merge branch 'master_14.2.2' into master_14.3.1	2014-04-25 11:06:11 -04:00
.classpath	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
.project	13.2.1-2 baseline	2013-01-23 11:18:44 -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.registry.ebxml.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00