Commit graph

5 commits

Author SHA1 Message Date
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
David Friedman
6536afe67e ASM #18132 - Text Workstation incorrectly reassigns ETN of TCV products
Change-Id: I19db78aa384a12f238a3be1375c276f7ff0f601f

Former-commit-id: 69492727ae30b793cf26a9431350b019f7eb6dd8
2015-10-07 16:01:38 +00:00
Ron Anderson
8a2f97eb72 Omaha #4441 Fix QC for areal flood products with snowmelt
Change-Id: I9c1b769ad0383db6576d149d5b9f638051229d27

Former-commit-id: 0d638b81eee218291e71cbda8932d57fa4aedaf4
2015-06-24 09:47:33 -05:00
Max Schenkelberg
2753c67345 Issue #2033 moved text workstation file into plugin, fixed PlotModelDataDefinition null pointer.
Change-Id: I41287c0af4f21dc842f99988f84da476bb6e785b

Former-commit-id: 1afd52c5452925d7198fdcfa00fd5a0122ff4674
2013-08-21 10:55:40 -05:00
Max Schenkelberg
c5575f9624 Issue #2033 moved avnfps and text workstation files into respective plugins.
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: 77e1a4d8f5237e5fae930c1e00589c752f8b3738
2013-08-15 12:21:43 -05:00