Steve Harris 07c7b38a12 Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 ... Conflicts: cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java Former-commit-id: db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly db4aa1cebe [formerly 2e2072a963] [formerly 7692e3f21d] [formerly b979960b7b [formerly 7692e3f21d [formerly 72f387d2802c12eedfe5643616fe5a54420aef66]]]] Former-commit-id: b979960b7b Former-commit-id: 4c7af33eee [formerly e5f8a8f74f] [formerly bb2bf4306deda494aadd9b7efdffeebf393b4e15 [formerly 50d6dccd09]] Former-commit-id: 0542ccaca6c476485c13ff1fd290c8c34213e7a0 [formerly f831536854] Former-commit-id: d3169a96b0		2014-09-23 11:41:10 -05:00
..
.settings	12.7.1-8 baseline	2012-07-19 16:20:40 -05:00
META-INF	Issue #2984 remove unnecessary plugins from features	2014-04-14 16:50:54 -05:00
res/spring	Omaha #2782: Update thread based logging	2014-05-08 09:06:31 -05:00
src/gov/noaa/nws/ost/edex/plugin/regionalsat	VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723	2014-09-15 16:30:22 -05:00
utility	12.12.1-1 baseline	2012-11-07 12:41:20 -06:00
.classpath	12.7.1-8 baseline	2012-07-19 16:20:40 -05:00
.project	12.7.1-8 baseline	2012-07-19 16:20:40 -05:00
build.properties	12.7.1-8 baseline	2012-07-19 16:20:40 -05:00
gov.noaa.nws.ost.edex.plugin.regionalsat.ecl	12.7.1-8 baseline	2012-07-19 16:20:40 -05:00