Commit graph

8 commits

Author SHA1 Message Date
Dave Hladky
160e1594b8 Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 38b952a220 [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]
Former-commit-id: 5dc454c7ef
2013-03-13 13:56:33 -05:00
Steve Harris
31c0a97dca 13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]
Former-commit-id: e12ed113ae
2013-03-13 09:50:28 -05:00
Steve Harris
33dd2589f1 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: a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: 2641d578e2
2013-02-21 15:41:39 -06:00
Steve Harris
46d28be4a4 13.3.1-1 baseline
Former-commit-id: 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: d2a654625f
2013-02-20 16:19:40 -06:00
Ron Anderson
e952a4f179 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]
Former-commit-id: 7c0a5d74bf
2013-02-15 09:03:41 -06:00
Steve Harris
47cc08ac79 13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 328c6dccad
2013-01-23 11:18:44 -05:00
Bryan Kowal
c1330e8121 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]
Former-commit-id: 4db9c6c321
2013-01-15 14:56:01 -06:00
Ben Steffensmeier
c6032b1950 Issue #1438 move all gfe processing out of the grib plugin.
Former-commit-id: 521924904a [formerly 2bf3884faa80d8db4d1589aacad05f24171ce3a4]
Former-commit-id: fe0a8b60c6
2012-12-19 11:26:40 -06:00