Richard Peter 1d08e54d43 Merge branch 'omaha_13.5.1' (13.5.1-7) into development ... Conflicts: cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF rpms/awips2.cave/deploy.builder/build.sh Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]] Former-commit-id: c6386e306f Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]] Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b] Former-commit-id: 2a9cfe51af		2013-07-22 09:40:18 -05:00
..
services	13.5.1-5 baseline	2013-07-03 12:20:27 -04:00
MANIFEST.MF	Issue #2142 Got log4j out of edex.	2013-07-15 14:26:15 -05:00