Shawn.Hooper 90badd7a3e Merge tag 'OB_15.1.2-9' into master_16.1.1 ... 15.1.2-9 Conflicts: cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18		2015-10-15 17:10:19 -04:00
..
common_static/base/vtec	Merge tag 'OB_15.1.2-9' into master_16.1.1	2015-10-15 17:10:19 -04:00
edex_static/base/vtec	Issue #1843: Return status back to client when contacting one of the	2013-10-30 11:34:46 -05:00