Commit graph

5 commits

Author SHA1 Message Date
Ben Steffensmeier
d386c6bc76 Issue #2491 Clean a few more procedure only objects from ISerializableObject files.
Former-commit-id: 5a928e6ad5 [formerly 047e4cd82846adaf8fc3dcdfe087209bd57e210c]
Former-commit-id: ff5f08d23a
2013-11-04 13:01:49 -06:00
Steve Harris
64744fdb19 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: a0573644c4
2013-02-21 15:41:39 -06:00
Steve Harris
8ae397085e 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
2013-02-20 16:19:40 -06:00
Ron Anderson
3033238f1b Issue #1629 Attempt to fix error saving preferences in GIS Viewer
Change-Id: I982637de1cc898d9887849a8276a3693b9579d5b

Former-commit-id: b76653a885 [formerly f0d1aa59c4971ed523e4f26b440134a417aec5d0]
Former-commit-id: d574da6155
2013-02-15 11:13:43 -06:00
Steve Harris
33bc5fd816 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00