Mirror of Unidata's AWIPS2.

Richard Peter 6dba9925c3 Issue #2362: Fix merge issue ... Former-commit-id: 51bf66d456 [formerly 03fa4950011aaee4f4d7cfeda68fe8ad3359a138] Former-commit-id: 814b1878b2		2013-10-28 12:13:04 -05:00
cave	Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3	2013-10-25 10:51:42 -05:00
cots	Issue #2362: Merge issues with initial cherry pick of Wes2Bridge DRs	2013-09-12 13:47:43 -05:00
cotsSource/org.apache.qpid	13.5.1-7 baseline	2013-07-18 12:07:22 -04:00
deltaScripts	13.5.2-4 baseline	2013-09-12 11:13:59 -04:00
edexOsgi	Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3	2013-10-25 10:51:42 -05:00
javaUtilities	13.5.2-8 baseline	2013-10-04 11:30:03 -04: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 #2176 Increased line width of emergency polygon and changed font for regular warning products.	2013-09-05 11:24:16 -05:00
MHSEmulator	13.5.2-2 baseline	2013-08-29 15:01:29 -04:00
msi	13.5.2-4 baseline	2013-09-12 11:13:59 -04:00
nativeLib	Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3	2013-10-25 10:51:42 -05:00
ncep	Issue #2362: Fix merge issue	2013-10-28 12:13:04 -05:00
ost	13.5.2-8 baseline	2013-10-04 11:30:03 -04:00
pythonPackages	Merge branch 'master_13.5.3' (13.5.2-7) into omaha_13.5.3	2013-10-01 14:22:33 -05:00
RadarServer	13.5.2-12 baseline	2013-10-25 09:59:15 -04:00
rpms	Merge branch 'master_13.5.3' (13.5.2-12) into omaha_13.5.3	2013-10-25 10:51:42 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Issue #2224 Unit test now handles different time types and configuation changes.	2013-09-12 11:50:23 -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