awips2/edexOsgi/com.raytheon.uf.common.datadelivery.registry
Brian.Dyke fe85eb9f70 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]
Former-commit-id: 3d9a3de6e4
2014-09-09 11:44:30 -04:00
..
.settings 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
META-INF Issue #1538 Moved data delivery specific web services out of registry plugins 2013-11-01 09:20:00 -05:00
res/spring Issue #2584 Step one of versioning for DD 2014-01-24 14:44:12 -06:00
src/com/raytheon/uf/common/datadelivery/registry Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1 2014-09-09 11:44:30 -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 #2552 - it is now possible to dynamically inject packages into the JaxbManager via Spring. 2013-11-14 15:17:28 -06:00
com.raytheon.uf.common.datadelivery.registry.ecl 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00