awips2/javaUtilities
Richard Peter 36361ae0c8 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 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: 401ed88e44 [formerly 15d1a6eab0]
Former-commit-id: 401ed88e44
Former-commit-id: 19dacc32c1
2013-07-22 09:40:18 -05:00
..
build.openfire.plugin Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
build.wes2bridge.utility Issue #2164 - fix 13.6.1 wes2bridge build 2013-07-03 15:35:12 -05:00
com.raytheon.openfire.plugin.configuration.collaboration Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.openfire.plugin.detailedfeedlog Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.uf.anttasks.includesgen 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
com.raytheon.uf.featureexplorer 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
com.raytheon.wes2bridge.common 13.4.1-4 baseline 2013-05-02 10:00:38 -05:00
com.raytheon.wes2bridge.configuration Issue #2153 - fix commons-logging dependencies for wes2bridge 2013-07-08 20:14:11 -05:00
com.raytheon.wes2bridge.datalink Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.raytheon.wes2bridge.manager Issue #2153 - fix commons-logging dependencies for wes2bridge 2013-07-08 20:14:11 -05:00
com.raytheon.wes2bridge.utility.feature 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
com.raytheon.wes2bridge.utility.product Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
hydro 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
yajsw Merge branch 'omaha_13.5.1' (13.5.1-7) into development 2013-07-22 09:40:18 -05:00