awips2/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume
David Friedman 4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
..
500Height.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
DefaultFamily.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
DefaultFourPanel.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
DefaultMesoFamily.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
DefaultStdEnv.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
DefaultStormScaleFamily.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
DefaultSurface.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ECMWFHiRes.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ECMWFHiResFourPanel.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ECMWFLowRes.xml Issue #2871 Make loadProperties a gridLoadProperties for ECMF bundles so equals works when loading as an image. 2014-03-20 13:31:08 -05:00
HeavyRainFamily.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
HRRR.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
HRRRFamily.xml VLab Issue #7124 - Added new HRRRFamily.xml to volume bundles. Edited Volume menu entry for HRRR model to call HRRRFamily.xml bundle; fixes #7124 2015-03-24 15:01:55 -04:00
LimitedFamily.xml Issue #2033 moved bundles and menu files into corresponding plugins 2013-08-14 09:20:28 -05:00
ModelFamilyA.xml VLab Issue #8856 - Fixes for Baumgardt additions; fixes #8856 2015-06-23 16:50:21 +00:00
ModelFamilyB.xml Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1 2015-07-30 20:53:19 +00:00
ModelFamilyC.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
ModelFamilyD-MandatoryLevels.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyD.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyE.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyF.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyH.xml VLab Issue #8856 - Fixes for Baumgardt additions; fixes #8856 2015-06-23 16:50:21 +00:00
ModelFamilyI.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
ModelFamilyJ.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyL-MandatoryLevels.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyL.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyM.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
ModelFamilyU.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
ModelFamilyV.xml Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1 2015-07-30 20:53:19 +00:00
ModelFamilyW.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
ModelFamilyX.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
ModelFamilyY.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
ModelFamilyYY.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
NonSupercellModelFamily.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
RaobStdEnv.xml Issue #2033 moved bundles and menu files into corresponding plugins 2013-08-14 09:20:28 -05:00
UKMET.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
UKMETFourPanel.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
WinterFamily.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00
WinterFnFourPanelFamily.xml VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688 2015-04-09 13:53:58 -05:00
WinterPTypeFamily.xml ASM #14663 Contour labels, in some cases, too small to see, not the same as AWIPS I. 2015-06-30 18:28:58 +00:00