Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 11a5db155d Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/SaveLevel2Data.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/common/FSSObsConfig.java


Former-commit-id: 218244406e4be6cb31b3986ff6457398a0a00bb5
2016-01-20 15:23:43 -06:00
build Omaha #4216 Fixed broken multi WA build, DD request router issue, sbnSIm and request sharing same debug port. 2015-12-10 10:34:39 -06:00
cave Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-20 15:23:43 -06:00
crh VLab Issue #12735 - GFS20PostProcessor does not handle CP grids; fixes #12735 2015-11-18 13:21:36 +00:00
deltaScripts Omaha #5253 Remove dataURI from SvrWx plugin 2016-01-19 11:34:57 -06:00
edexOsgi Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-20 15:23:43 -06:00
javaUtilities Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-06 11:55:00 -06:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization VLab Issue #12697 -DCS18223 Baseline additional maps; fixes #12697 2015-10-26 14:12:40 +00:00
nativeLib Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-20 15:23:43 -06:00
ost Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-06 11:55:00 -06:00
pythonPackages Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-20 15:23:43 -06:00
RadarServer Merge tag 'OB_16.1.2-9' into master_16.2.1 2016-01-12 15:10:02 -05:00
rpms Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-20 15:23:43 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #4839 Update for Jetty9 compatibility. Remove jetty jars from tests. 2015-11-19 15:56:02 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00