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
..
META-INF	Omaha #5166: Update logging to use SLF4J:radar,recco,npp.viirs	2015-12-16 16:42:17 -06:00
res/spring	Issue #2726: Edex graceful shutdown.	2014-04-14 13:10:11 -05:00
src/com/raytheon/uf/edex/plugin/npp/viirs	Omaha #5166: Update logging to use SLF4J:radar,recco,npp.viirs	2015-12-16 16:42:17 -06:00
utility	Updates from merge of ncep_15.1.1-n branch	2015-10-28 14:10:22 -04:00
.classpath	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
.project	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
build.properties	Omaha #4469 Some files are missing from plugins' build.properties	2015-05-19 11:47:40 -05:00
com.raytheon.uf.edex.plugin.npp.viirs.ecl	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00