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	13.2.1-6 baseline	2013-02-07 16:00:39 -06:00
res/spring	Omaha #3211 changes to support improved authentication/authorization	2014-05-29 15:28:53 -05:00
src/com/raytheon/uf/edex/plugin/nwsauth	Omaha #4834 remove catch LocalizationOpFailedException	2015-11-12 14:32:01 -06:00
utility/common_static/base/roles	Omaha #5164 Updated userRoles.xml for Hazard Services.	2015-12-08 17:50:38 -06:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Merge tag 'OB_15.1.1-16' into omaha_16.1.1	2015-06-05 15:38:00 -05:00
com.raytheon.uf.edex.plugin.nwsauth.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00