awips2/cave/com.raytheon.viz.volumebrowser
Ana Rivera 0f2e031c70 Merge branch 'master_15.1.1' into field_15.1.1
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml was removed.
"Visibility Anl Uncertainty" entry in .../fields/planview-timeseries/other.xml was added to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Change-Id: I4cac5e1ee29119569cb19c235ec5d1664eb08b8c

Former-commit-id: 4dad0cb77e2101fc8ec2d46924b6c64dcc0d12cb
2015-04-20 19:14:43 +00:00
..
.settings Omaha #3549 remove jdt prefs for faster builds 2014-12-03 15:47:10 -06:00
localization Merge branch 'master_15.1.1' into field_15.1.1 2015-04-20 19:14:43 +00:00
META-INF Issue #2725 Move derived parameters logic to common 2014-04-09 09:31:12 -05:00
src/com/raytheon/viz/volumebrowser Omaha #4105 synchronize forcastTimeMap to prevent ConcurrentModificationException. 2015-02-13 07:36:31 -06:00
.classpath Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
com.raytheon.viz.volumebrowser.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
DataSelectionMenuItems.xml 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
plugin.xml Issue #2602 Switch around the order of some things on startup to make thinclient better. 2013-12-11 12:45:11 -06:00