awips2/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp
Steve Harris 02105701a0 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]
Former-commit-id: a23cecdb26
Former-commit-id: e96e95b565
2013-03-26 10:12:34 -05:00
..
dao Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
dataaccess Issue #1552 - Implement FFMP Data Access 2013-02-25 09:29:16 -06:00
FFMPAggregateRecord.java Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
FFMPBasin.java Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
FFMPBasinData.java Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
FFMPBasinMetaData.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
FFMPCacheRecord.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
FFMPCounties.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
FFMPCounty.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
FFMPDataContainer.java Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
FFMPGap.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
FFMPGuidanceBasin.java Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
FFMPGuidanceInterpolation.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
FFMPRecord.java Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw. 2013-03-04 17:41:11 -06:00
FFMPTemplates.java Merge branch 'omaha_13.3.1' into development 2013-03-26 10:12:34 -05:00
FFMPUtils.java Issue #1817 BOX issue with only having HUC0 in template 2013-03-22 16:21:45 -05:00
FFMPVirtualGageBasin.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
FFMPVirtualGageBasinMetaData.java 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
HucLevelGeometriesFactory.java Issue #1569 Switched aggregate record writing to pypies. General sweep of ingestDAT 2013-02-14 13:58:32 -06:00
SourceBin.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
SourceBinEntry.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
SourceBinList.java 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00