Mirror of Unidata's AWIPS2.
Find a file
Fay.Liang 3c6247522e Merge branch 'master_14.3.1' into master_14.3.2
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 07076f91aa [formerly 155801c3d418b6deb7e17ffb04c963a80d092c5a]
Former-commit-id: 1e4522ddd2
2015-02-10 10:59:16 -05:00
cave Merge branch 'master_14.3.1' into master_14.3.2 2015-02-10 10:59:16 -05: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 ASM #533 - Add delta script for 14.3.1 to delete FSS Obs Config Files 2014-10-24 13:06:29 -04:00
edexOsgi Merge branch 'master_14.3.1' into master_14.3.2 2015-02-10 10:59:16 -05: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 Merge branch 'ohd_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 2015-02-04 21:35:40 -05:00
ncep VLab Issue #5618 - Comp(Src) button not functioning properly in NSHARP 2015-02-05 13:38:41 -05: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 Merge branch 'master_14.2.4' into master_14.3.1 2014-11-06 12:55:21 -05: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.3.1' into master_14.3.2 2015-02-10 10:59:16 -05: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