Mirror of Unidata's AWIPS2.

Brian.Dyke 624606c9dd Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2) ... Conflicts: cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]] Former-commit-id: 63137ed69c Former-commit-id: 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52] Former-commit-id: fcf13ae9f7		2014-04-30 12:57:09 -04:00
cave	Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)	2014-04-30 12:57:09 -04:00
cots	Issue #2905 modified ucar BUFR library to fix bug	2014-04-10 16:43:10 -05:00
cotsSource/org.apache.qpid	13.5.1-7 baseline	2013-07-18 12:07:22 -04:00
deltaScripts	Merge branch 'master_14.2.2' into master_14.3.1	2014-04-25 11:06:11 -04:00
edexOsgi	Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)	2014-04-30 12:57:09 -04:00
javaUtilities	Issue #2937 Consolidated LogEntry to string and from string conversions in utility	2014-04-09 18:47:09 -05: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	Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things	2013-07-11 13:32:26 -05:00
MHSEmulator	Issue #2758 Fix MHSEmulator to pass small files	2014-02-13 15:53:15 -06:00
msi	Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds	2014-03-31 12:37:37 -05:00
nativeLib	Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development	2014-03-26 16:19:26 -05:00
ncep	Merge branch 'omaha_14.2.2' (14.2.2-3) into development	2014-04-11 16:23:09 -05:00
ost	Issue #3017 Update SatSpatialFactory to have more specific methods.	2014-04-15 13:29:05 -05:00
pythonPackages	Merge branch 'master_14.2.2' into master_14.3.1	2014-04-25 11:06:11 -04:00
RadarServer	Merge branch 'omaha_14.2.2' (14.2.2-3) into development	2014-04-11 16:23:09 -05:00
rpms	Merge branch 'master_14.2.2' into master_14.3.1	2014-04-25 11:06:11 -04:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Issue #2889 user who issued change now shows in notification center	2014-04-02 14:06:25 -05: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