Commit graph

5 commits

Author SHA1 Message Date
Jonathan Sanchez
e4268f814e Issue Refactored watches to use the county table.
Change-Id: Ide7e07813203213511640d5ee515e73b278089c1

Former-commit-id: 997485dd22 [formerly 86a8ca4a30] [formerly 997485dd22 [formerly 86a8ca4a30] [formerly b991838494 [formerly 135d7ffa84af58d7b3c9575e654fa1298b76b2e2]]]
Former-commit-id: b991838494
Former-commit-id: f7bc9a8023 [formerly 025c29acc0]
Former-commit-id: 56cbd23141
2014-07-22 15:32:12 -05:00
Brian.Dyke
a9af4960f0 Issue
Former-commit-id: ed476a583f [formerly 3f86a80d7e] [formerly ed476a583f [formerly 3f86a80d7e] [formerly dad6f2896b [formerly 043faa447b4fc15a996dfe6108093bed5f1b6497]]]
Former-commit-id: dad6f2896b
Former-commit-id: 17e3464377 [formerly 610cf76a29]
Former-commit-id: 6e57eae922
2014-02-04 17:05:12 -05:00
Richard Peter
86c28e6e16 Merge branch 'omaha_13.5.3' (13.5.2-7) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java

Change-Id: Ie8cbc10d06805616c05a5d5b52cd725a56f9cf50

Former-commit-id: 75b0f19d87 [formerly bb9488bb92] [formerly 75b0f19d87 [formerly bb9488bb92] [formerly f4e71b65d3 [formerly 724a8c87ab8aa880dab45a0a743c3b9d6ace4e2e]]]
Former-commit-id: f4e71b65d3
Former-commit-id: 3514194d3b [formerly 39ae6d437d]
Former-commit-id: ddf07f8030
2013-10-01 15:06:34 -05:00
Richard Peter
2a9cfe51af 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: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
2013-07-22 09:40:18 -05:00
Nate Jensen
06502f57ef Issue move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 188d76ea71 [formerly 5264d3a5b8] [formerly 188d76ea71 [formerly 5264d3a5b8] [formerly b767760a9c [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]
Former-commit-id: b767760a9c
Former-commit-id: 93713d9698 [formerly c77936c6c0]
Former-commit-id: 175a28da9a
2013-07-18 09:53:53 -05:00
Renamed from edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/impactSevereThunderstormWarning.xml (Browse further)