Mirror of Unidata's AWIPS2.

Steve Harris d407129dba Merge tag 'OB_14.3.1-25m' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java Former-commit-id: 3c91dfd8b7 [formerly c0c1ce7700] [formerly 39b2199cec] [formerly 39b2199cec [formerly ad4393bea3]] [formerly 3c91dfd8b7 [formerly c0c1ce7700] [formerly 39b2199cec] [formerly 39b2199cec [formerly ad4393bea3]] [formerly c9e37bf440 [formerly 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]]] Former-commit-id: c9e37bf440 Former-commit-id: 85a84d662d [formerly e80527ade2] [formerly fc424d7336] [formerly fa0b744e662436c2fbdc7bc093ef8e612411dade [formerly 669e99e1efdfc40962f1589446fe9efe4b3f8b52] [formerly fc424d7336 [formerly fc35b7313d]]] Former-commit-id: 68fd5903e9fff2e0e8a9aea68086bd4cb62bb006 [formerly 292297ad70be43ccc935b96eca7a8409d4033fc4] [formerly 7c4bb336e1 [formerly f370a2f54e]] Former-commit-id: 7c4bb336e1 Former-commit-id: 118c19a83d		2014-10-07 13:35:58 -05:00
cave	Merge tag 'OB_14.3.1-25m' into omaha_14.4.1	2014-10-07 13:35:58 -05:00
deltaScripts	Merge tag 'OB_14.3.1-24m' into omaha_14.4.1	2014-10-06 13:57:59 -05:00
edexOsgi	Merge tag 'OB_14.3.1-25m' into omaha_14.4.1	2014-10-07 13:35:58 -05:00
javaUtilities	Merge "Omaha #3573 fixed clean in collaboration dataserver ant script" into omaha_14.4.1	2014-09-02 10:40:13 -05:00
localApps	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localization	Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.	2014-05-09 09:34:49 -05:00
msi	Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds	2014-03-31 12:37:37 -05:00
nativeLib	Omaha #3300 - Added another compiled nativeLib binary to finish the Merge tag 'OB_14.3.1-19m' into omaha_14.4.1	2014-09-23 15:30:55 -05:00
ncep	Omaha #3663 move features that contain primarily ncep plugins to ncep	2014-09-29 17:24:34 -05:00
ost	Merge tag 'OB_14.3.1-19m' into omaha_14.4.1	2014-09-23 11:41:10 -05:00
pythonPackages	Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.	2014-10-01 14:57:16 -04:00
RadarServer	Omaha #3502 removed common.convert from rcm feature	2014-08-11 09:56:53 -05:00
rpms	Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1	2014-10-03 10:18:34 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Omaha #3365 Realign AWIPS2_baseline tests	2014-09-30 12:53:20 -05:00
.gitignore	Fix the git ignore file	2012-09-14 12:04:24 -05:00