Mirror of Unidata's AWIPS2.
Find a file
Brian.Dyke 4671c25ea4 Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java

Former-commit-id: 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly 5afaee3d33 [formerly 822ad181bf] [formerly 2fd18d14d6] [formerly db68b80bbd [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]]]
Former-commit-id: db68b80bbd
Former-commit-id: 5a07e9c984 [formerly 937b9bb9ce] [formerly 6fbbfc0267046011d5fd8ba4c15aa6b2ab182188 [formerly ebcaebb28d]]
Former-commit-id: 6e138f1746a6c0aa092e3c298cd91ece951e39d3 [formerly f42d40c3a3]
Former-commit-id: b0b377e811
2014-05-20 14:35:34 -04:00
cave Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2 2014-05-20 14:35:34 -04:00
cots Issue #2581 fix local storm report delta script and unique constraint 2014-01-15 09:50:35 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #3142: Improve error-handling and logging in CleanupGfeHDF5Storage delta script. 2014-05-08 16:51:41 -05:00
edexOsgi Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2 2014-05-20 14:35:34 -04:00
javaUtilities Issue #2788 Fix topo for large areas. 2014-02-13 10:10:34 -06: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 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
MHSEmulator 13.5.2-2 baseline 2013-08-29 15:01:29 -04:00
msi Merge branch 'master_14.1.1' into master_14.2.1 2014-03-07 09:01:09 -05:00
nativeLib Issue #3102: Fix edexBridge connection leak 2014-05-06 10:32:31 -05:00
ncep Issue #2919 fix windows error due to gempak library missing 2014-03-20 09:38:07 -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.1.2' into master_14.2.1 2014-04-09 16:00:54 -05:00
RadarServer Merge "ASM #240 - RPS lists delivered by awips2-rcm out of date" into asm_14.2.2 2014-05-16 16:40:38 -05:00
rpms Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2 2014-05-20 14:35:34 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23) 2014-05-12 16:13:19 -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