awips2/cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions
Brian.Dyke b8b9d3105b Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
	ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml

Former-commit-id: 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 6dafb062e9 [formerly b49b13f77e] [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly 4b418918d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]]]
Former-commit-id: 87fa32d2d4
Former-commit-id: e16e6e5a2a [formerly cf8f88a5b3] [formerly cd9613c4078591bf28ad1064690bfbbbf551cbaa [formerly 1f09dad9e9]]
Former-commit-id: c0bfed574e2fa14299c865bac77af847704ef3c7 [formerly 8997f79ae4]
Former-commit-id: c22973f909
2014-09-24 11:05:37 -04:00
..
TPCSurgeProb Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1 2014-05-27 14:48:24 -04:00
BLI.xml VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 2014-08-28 18:38:26 +00:00
DIRC.xml Issue #2875 - Implemented HFR Surface Current Velocity. 2014-08-19 10:12:36 -05:00
GVV1hr.xml VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671 2014-09-11 21:17:43 +00:00
LTNG.xml VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671 2014-09-11 21:17:43 +00:00
MAXUPHL.xml VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671 2014-09-11 21:17:43 +00:00
MaxWHRRR.xml VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 2014-08-28 18:38:26 +00:00
MXDVV.xml VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671 2014-09-11 21:17:43 +00:00
MXREF.xml VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 2014-08-28 18:38:26 +00:00
MXUPHL.xml VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 2014-08-28 18:38:26 +00:00
MXUVV.xml VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671 2014-09-11 21:17:43 +00:00
OGRD.xml Issue #2875 - Implemented HFR Surface Current Velocity. 2014-08-19 10:12:36 -05:00
SPC.xml Issue #2875 - Implemented HFR Surface Current Velocity. 2014-08-19 10:12:36 -05:00
WGS1hr.xml VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617 2014-08-28 18:38:26 +00:00