Richard Peter 19dacc32c1 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: c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]] Former-commit-id: 15d1a6eab0 Former-commit-id: 401ed88e44		2013-07-22 09:40:18 -05:00
..
.settings	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
META-INF	Issue #2142 Got log4j out of edex.	2013-07-15 14:26:15 -05:00
res	Issue #2195 Remove Spring name= use in constructor args	2013-07-15 13:20:44 -05:00
resources	Issue #2191: Registry Garbage Collection	2013-07-12 11:33:21 -05:00
src/com/raytheon/uf/edex/registry	Merge branch 'omaha_13.5.1' (13.5.1-7) into development	2013-07-22 09:40:18 -05:00
utility	13.5.1-4 baseline	2013-06-28 09:46:25 -04:00
web	Issue #2191 Fixed spring error	2013-07-18 12:50:10 -05:00
.classpath	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
.project	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
build.properties	13.2.1-2 baseline	2013-01-23 11:18:44 -05:00
com.raytheon.uf.edex.registry.ebxml.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00