awips2/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp
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
..
META-INF Omaha #5244 Replace deprecated LocalizationFile methods. 2016-02-16 10:28:39 -05:00
res/spring 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
src/com/raytheon/uf/common/dataplugin/ffmp Merge tag 'OB_16.2.1-23' into master_16.2.2 2016-04-18 12:07:11 -04:00
utility/common_static/base Omaha #4756 Wrong conversion bounds for ARI grids, fixed. 2015-10-15 15:58:04 -05:00
.classpath Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Omaha #4469 Some files are missing from plugins' build.properties 2015-05-19 11:47:40 -05:00
com.raytheon.uf.common.dataplugin.ffmp.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00