Mirror of Unidata's AWIPS2.
Find a file
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
build Merge tag 'OB_14.4.1-20m' into master_15.1.1 2015-03-30 14:28:30 -04:00
cave Merge branch 'master_15.1.1' into field_15.1.1 2015-04-20 19:14:43 +00:00
crh ASM #17168 - Add directory/files needed to create new decoderpostprocessor rpm 2015-02-26 13:15:17 -05:00
deltaScripts Merge tag 'OB_14.4.1-25' into master_15.1.1 2015-04-13 13:02:24 -04:00
edexOsgi Merge branch 'master_15.1.1' into field_15.1.1 2015-04-20 19:14:43 +00:00
javaUtilities Omaha #3299 - Updated deploy-install to find features 2015-02-25 09:51:49 -06:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05:00
nativeLib Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 2015-04-08 12:22:27 -04:00
ost Merge tag 'OB_14.3.1-19m' into omaha_14.4.1 2014-09-23 11:41:10 -05:00
pythonPackages Merge tag 'OB_14.4.1-20m' into master_15.1.1 2015-03-30 14:28:30 -04:00
RadarServer Merge tag 'OB_14.4.1-20m' into master_15.1.1 2015-03-30 14:28:30 -04:00
rpms Merge tag 'OB_14.4.1-25' into master_15.1.1 2015-04-13 13:02:24 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'ncep_14.2.2-n' into ncep_14.4.1 2014-12-16 13:06:21 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00