Mirror of Unidata's AWIPS2.
Find a file
Dave Hladky 155903d135 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
2013-03-12 15:48:34 -05:00
cave Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
cots Merge branch 'development' into omaha_13.3.1 2013-02-25 15:58:48 -06:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
edexOsgi Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
javaUtilities Issue #1577 - deploy-install and AWIPS II ant task updates 2013-02-05 13:25:15 -06:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
nativeLib Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
ncep Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
ost 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
pythonPackages Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
RadarServer 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
rpms Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1643 Standardize access for EDEX service requests, separate router code into its own Spring file. 2013-02-26 15:06:04 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00