Mirror of Unidata's AWIPS2.
Find a file
Steve Harris ec8b83dd67 Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2
16.2.1-lx-29

 Conflicts:
	cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/SimpleLogViewer.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcFreezeOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcPrecipOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/QcTempOptionsDialog.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DeletePolygonDlg.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/total/TotalLightningDecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SaveCombinationsFileHandler.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm


Former-commit-id: 17c68986a20e9a589d40407800dd52678fcda68b
2016-05-12 09:28:49 -05:00
build Merge "Omaha #5606 - set java.io.tmpdir for yajsw as the destination for jna executables" into omaha_16.2.2 2016-04-29 15:22:57 -05:00
cave Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05:00
cm/AWIPS2_NWS Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05:00
deltaScripts Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05:00
edexOsgi Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05: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 tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05:00
pythonPackages Omaha #5426 Add issueYear to active table primary key 2016-03-17 10:33:29 -05:00
RadarServer Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05:00
rpms Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2 2016-05-12 09:28:49 -05: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