awips2/ost
Steve Harris 8a07970ba6 Merge branch 'omaha_16.2.1' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java


Former-commit-id: d9745246c0f81ec088b3f4108b30e02c33f6a9ae
2016-01-06 11:55:00 -06:00
..
com.raytheon.uf.edex.ost.feature VLab Issue #10348 - DCS17366 Display Spot Locations; fixes #10348 2015-11-03 18:12:01 +00:00
gov.noaa.nws.ost.dataplugin.stq VLab Issue #10348 - DCS17366 Display Spot Locations; fixes #10348 2015-11-03 18:12:01 +00:00
gov.noaa.nws.ost.edex.plugin.binlightning Omaha #3226 fixed lightning decrypt validation, added initialization vector 2014-06-19 10:32:05 -05:00
gov.noaa.nws.ost.edex.plugin.regionalsat Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3. 2015-10-28 13:21:07 -05:00
gov.noaa.nws.ost.edex.plugin.stq VLab Issue #10348 - DCS17366 Display Spot Locations; fixes #10348 2015-11-03 18:12:01 +00:00