Mirror of Unidata's AWIPS2.
Find a file
Shawn.Hooper 8f1d77ca35 Merge tag 'OB_16.2.1-23' into master_16.2.2
16.2.1-23

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java

Change-Id: I9497704adcca5b6df8728b6124e310a709447061

Former-commit-id: 55fc99c303e27f17f488bf053805622714c9d69c
2016-04-18 12:07:11 -04:00
build Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2 2016-04-13 13:37:34 -04:00
cave Merge tag 'OB_16.2.1-23' into master_16.2.2 2016-04-18 12:07:11 -04:00
cm/AWIPS2_NWS Omaha #5088 - remove .project files so eclipse doesn't pull these in. 2016-03-23 12:55:02 -05:00
deltaScripts Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2 2016-04-13 13:37:34 -04:00
edexOsgi Merge tag 'OB_16.2.1-23' into master_16.2.2 2016-04-18 12:07:11 -04:00
javaUtilities Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-06 11:55:00 -06: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 ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528" 2016-03-28 15:47:44 -04:00
pythonPackages Omaha #5426 Add issueYear to active table primary key 2016-03-17 10:33:29 -05:00
RadarServer Merge branch 'omaha_16.2.2' into field_16.2.2 2016-02-22 20:35:27 +00:00
rpms Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2 2016-04-13 13:37:34 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #4839 Update for Jetty9 compatibility. Remove jetty jars from tests. 2015-11-19 15:56:02 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00