awips2/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite
Richard Peter f5f75ec629 Merge branch 'development_on_RHEL5' (GOES-R) into development
Conflicts:
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatBlendedResource.java
	nativeLib/edexBridge/edexBridge.cpp
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh

Former-commit-id: 039d9ecb587338801cdab9cad11b06890517d6a4
2013-12-03 16:25:31 -06:00
..
dataaccess 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
units Issue #2492 Got mosaicing to happen in mosaic image units, satellite provides data units for images 2013-11-25 11:31:57 -06:00
SatelliteMessageData.java Issue #2393 removed pypies interpolation 2013-11-20 08:40:12 -06:00
SatelliteRecord.java Issue #2333 Removed more unused fields from satellite record 2013-10-11 16:17:52 -05:00
SatMapCoverage.java Issue #2333 Refactored satellite to store table values in CRS space instead of lat/lon for GOES-R readiness 2013-10-03 11:43:26 -05:00