Mirror of Unidata's AWIPS2.
Find a file
Brian.Dyke b8b9d3105b Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4]
Former-commit-id: c22973f909
2014-09-24 11:05:37 -04:00
cave Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1 2014-09-24 11:05:37 -04:00
cots Issue #2905 modified ucar BUFR library to fix bug 2014-08-05 08:33:45 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 2014-09-19 16:56:50 -04:00
edexOsgi Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1 2014-09-24 11:05:37 -04:00
javaUtilities Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 2014-08-27 11:19:19 -04:00
ldm Issue #3458 Increase ldm to edexBridge shared memory queue. 2014-08-06 10:57:31 -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 VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so 2014-09-17 15:39:57 -04:00
ncep Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1 2014-09-24 11:05:37 -04:00
ohd VLab Issue #4602 2014-09-08 11:44:48 -04:00
ost VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723 2014-09-15 16:30:22 -05:00
pythonPackages ASM #550 - Remove ITO call from monitor_qpid_hosts.sh 2014-05-30 14:09:16 -04:00
RadarServer Merge branch 'master_14.3.1' into asm_14.3.1 2014-05-30 10:09:00 -04:00
rpms Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1 2014-09-24 11:05:37 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #3045 Code cleanup for CategoryConfig and ArchiveConfig, 2014-08-05 08:43:58 -05:00
tools Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00