Brian.Dyke a08db8d73d Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1 ... Conflicts: cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java Former-commit-id: aa83bf804f [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6] Former-commit-id: e654318431		2014-08-27 11:19:19 -04:00
..
TPCSurgeProb	Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1	2014-05-27 14:48:24 -04:00
DIRC.xml	Issue #2875 - Implemented HFR Surface Current Velocity.	2014-08-19 10:12:36 -05:00
OGRD.xml	Issue #2875 - Implemented HFR Surface Current Velocity.	2014-08-19 10:12:36 -05:00
SPC.xml	Issue #2875 - Implemented HFR Surface Current Velocity.	2014-08-19 10:12:36 -05:00