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
..
localization	Omaha #4834 correct some menu items	2015-12-14 12:12:03 -06:00
META-INF	Updates from merge of ncep_15.1.1-n branch	2015-10-28 14:10:22 -04:00
src/com/raytheon/uf/viz/d2d/nsharp	Updates from merge of ncep_15.1.1-n branch	2015-10-28 14:10:22 -04:00
.classpath	Omaha #4146 Bundled class files in a jar when unpacked.	2015-05-19 10:23:35 -05:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Omaha #4146 Bundled class files in a jar when unpacked.	2015-05-19 10:23:35 -05:00
com.raytheon.uf.viz.d2d.nsharp.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
plugin.xml	Omaha #3861 Separate product creation from the main vb plugin.	2015-08-04 14:09:04 -05:00