awips2/edexOsgi/com.raytheon.uf.common.dataplugin.grid
Ana Rivera da79c8cca4 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
..
META-INF Omaha #3356 cleanup of unnecessary register buddies and buddy policies 2014-08-14 10:22:37 -05:00
res Issue #2060: Consolidate grid indexes. 2014-05-12 16:59:34 -05:00
src/com/raytheon/uf/common/dataplugin/grid Omaha #3959 - Make subgridding grid based. 2015-03-05 16:13:41 -06:00
utility/common_static/base Merge branch 'master_15.1.1' into field_15.1.1 2015-04-20 19:14:43 +00:00
.classpath 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
.project 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
build.properties Omaha #3993 ensure important dataplugin utility folders are included in 2015-01-13 16:47:04 -06:00
com.raytheon.uf.common.dataplugin.grid.ecl 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00