Mirror of Unidata's AWIPS2.

Shawn.Hooper f27a0b1e80 ASM #18056 - Fix merge issues for serverConfig.py in 1621-4 ... Change-Id: I22fb443dbdc32da185f1cec2ed1e427048d74e19 Former-commit-id: 497cbf7a4c272b823064edeeb55a36063ff09c6b		2016-01-04 16:54:55 -05:00
build	Omaha #3315 - fix checking amount of memory	2015-10-13 17:33:17 -05:00
cave	Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1	2016-01-04 16:47:59 -05:00
crh	VLab Issue #12735 - GFS20PostProcessor does not handle CP grids; fixes #12735	2015-11-18 13:21:36 +00:00
deltaScripts	Omaha #4897 - update dat menu delta script to remove additional auto-generated files.	2015-11-04 10:36:37 -06:00
edexOsgi	ASM #18056 - Fix merge issues for serverConfig.py in 1621-4	2016-01-04 16:54:55 -05:00
javaUtilities	Merge branch 'asdt_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1	2015-11-16 16:40:30 -05:00
localApps	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localization	VLab Issue #12697 -DCS18223 Baseline additional maps; fixes #12697	2015-10-26 14:12:40 +00:00
nativeLib	Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1	2016-01-04 16:47:59 -05:00
ost	VLab Issue #10348 - DCS17366 Display Spot Locations; fixes #10348	2015-11-03 18:12:01 +00:00
pythonPackages	Omaha #4982 Verify datatypes match when replacing data (take 2).	2015-10-20 16:13:01 -04:00
RadarServer	Merge "VLab Issue #10351 - DCS17789 add radar TPSF; fixes #10351" into asdt_16.2.1	2015-10-30 15:02:40 +00:00
rpms	Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1	2016-01-04 16:47:59 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Merge branch 'ncep_14.2.2-n' into ncep_14.4.1	2014-12-16 13:06:21 -05:00
.gitignore	Omaha #3685 Add support for sending specific products in mixed case	2014-10-22 14:29:30 -05:00