Commit graph

7 commits

Author SHA1 Message Date
Benjamin Phillippe
af05feb5a7 Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 534777d96a45b275abd9cc26818b7df200974595
2013-03-25 15:15:38 -05:00
Dustin Johnson
722e41b8b0 Issue #1643 Add NCF bandwidth manager router
Change-Id: I226bf657469eccc68c29cb21dac10cc10e562ca8

Former-commit-id: 2b52368c81272df18f3af1334057295d11bb4b52
2013-02-26 11:32:03 -06:00
Steve Harris
2641d578e2 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: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
Steve Harris
d2a654625f 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
328c6dccad 13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
2013-01-23 11:18:44 -05:00
Matt Nash
b4f48078ca Issue #1491 add Geometry converter and move registry spring instantiation
Change-Id: I7794f41c637b5e29662356d81e172d3484e66a56

Former-commit-id: 94b52c4d617f15bb0bd8d460eb9c5ab6e1a201e6
2013-01-15 17:06:28 -06:00
Bryan Kowal
d6b4cb65f4 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: b535a90fb25287945485c10b3c85749c11285171
2013-01-07 12:16:01 -06:00