Commit graph

5 commits

Author SHA1 Message Date
Brian.Dyke
408ecfa5c0 Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade

Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults

Former-commit-id: 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 5524d6b38d [formerly a0a879be7d] [formerly a8737e18f0] [formerly 3f1e12effc [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]]]
Former-commit-id: 3f1e12effc
Former-commit-id: c76d6df69d [formerly 3961c75ecd] [formerly 8ed2dc55683cd373c693766e728d2dbc5c2f9e63 [formerly 66aacd6578]]
Former-commit-id: 48941da01de7ecd361d967e7d76a018c85a27337 [formerly a23d371522]
Former-commit-id: 9351315fd6
2014-05-30 10:46:25 -04:00
Chip Gobs
172481a6aa VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada

Former-commit-id: a95de2211a [formerly 4e4d00792d] [formerly 65d2135ac2] [formerly a95de2211a [formerly 4e4d00792d] [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 65d2135ac2 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]]
Former-commit-id: e42bef2a33
Former-commit-id: 5045e9fa66 [formerly c075175e8e] [formerly 3dc38f5850d9a6af32e30312873669ceb1e3ea3b [formerly 593b36d722]]
Former-commit-id: 77c9177d0a8eb55155050f750d97f90b20791bb0 [formerly 1b7f762617]
Former-commit-id: 47068a7939
2014-05-06 10:48:35 -04:00
Brad Gonzales
f149cab30e Issue #3024 Removed edex feature build.xml files. Removed bkowal from the buildEnvironment.sh script.
Change-Id: Ic1ee22e604a68c2c475cb002901413c55bda6bd1

Former-commit-id: 9c6f68a56f [formerly 5957c45cea] [formerly fdfac581d6] [formerly 9c6f68a56f [formerly 5957c45cea] [formerly fdfac581d6] [formerly 1fcffc5db8 [formerly fdfac581d6 [formerly fdf7e47c2ddcfe4154ee117a0b5a722cd420df20]]]]
Former-commit-id: 1fcffc5db8
Former-commit-id: 26b95f945e [formerly c11506a0c9] [formerly 86a837c9ba02a232e781433a5fdcf46bfeb6af6d [formerly 679a623d87]]
Former-commit-id: 6e902fcd67eea53404b5aed28b2891e7daea7551 [formerly da2d3c0fe9]
Former-commit-id: 4e5664e0a2
2014-04-22 15:39:08 -05:00
Steve Harris
bc97cf788a 12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly 7248f8b762 [formerly 0abf64b77c] [formerly 195158c004] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9]
Former-commit-id: a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00