Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 85055fcc53 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatedata/ClimateDataMenuDlg.java
	cave/com.raytheon.viz.awipstools/localization/menus/tools/baseToolsMenu.xml
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 68c13f9160746f365bd5f896b1400f1a8099ebe8
2016-02-01 11:57:52 -06:00
build Omaha #4562: Isolate simple text product decoding 2016-01-21 14:21:15 -06:00
cave Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-02-01 11:57:52 -06:00
crh VLab Issue #12735 - GFS20PostProcessor does not handle CP grids; fixes #12735 2015-11-18 13:21:36 +00:00
deltaScripts Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-02-01 11:57:52 -06:00
edexOsgi Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-02-01 11:57:52 -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 Omaha #5208 Remove unnecessary commons logging dependency from stq. 2016-01-21 15:32:47 -06:00
pythonPackages Omaha #4795 Python DAF regression test script 2016-01-26 14:17:21 -06:00
RadarServer Merge "Omaha #5271 - include the time span for products that track time span in minutes." into omaha_16.2.2 2016-01-25 13:02:05 -06:00
rpms Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-02-01 11:57:52 -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