Steve Harris
|
b5d9e75b95
|
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: 64744fdb19 [formerly a0573644c4 ] [formerly 64744fdb19 [formerly a0573644c4 ] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1 ]
Former-commit-id: f3c3191a1c
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
8c828dbd75
|
13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021 ] [formerly 8ae397085e [formerly 71e8990021 ] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4 ]
Former-commit-id: b3b56830b0
|
2013-02-20 16:19:40 -06:00 |
|
Brad Gonzales
|
7253bbf20e
|
Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 35cc853c74 [formerly f459554e33 ] [formerly 35cc853c74 [formerly f459554e33 ] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 8fc5c18ebd [formerly f3ef309293 ]
Former-commit-id: adbfa7ced1
|
2013-02-04 08:52:33 -06:00 |
|
Steve Harris
|
08bf724a6c
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b ] [formerly 48d1aa7732 [formerly 9771dfae6b ] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 8ed6a53113 [formerly f6670806bf ]
Former-commit-id: 9146e727f9
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
b4556ea28f
|
13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7 ] [formerly 5dfe4d10f1 [formerly e62172c8c7 ] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: e34695538d [formerly 8713dfc5ca ]
Former-commit-id: ebff2a6275
|
2013-01-14 18:42:21 -05:00 |
|
Steve Harris
|
b7f180d9d3
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c ] [formerly efd3392abe [formerly 8e5f9e0e6c ] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57 ]
Former-commit-id: 05bdc0ecd2
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a ] [formerly 51208e5515 [formerly c0c1d56f3a ] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553 ]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
f8a9ae24cb
|
12.12.1-12 baseline
Former-commit-id: 89def5cf03 [formerly e8e41630e8 ] [formerly 89def5cf03 [formerly e8e41630e8 ] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab [formerly 7bb37caa23 ]
Former-commit-id: 190378beeb
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
f61c5114e8
|
12.10.1-4 baseline
Former-commit-id: 9cd1f3ec0f [formerly 791ef6cedf ] [formerly 9cd1f3ec0f [formerly 791ef6cedf ] [formerly 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]
Former-commit-id: 92cc2d8605
Former-commit-id: f641cdd4e0 [formerly b4d2a0e8dd ]
Former-commit-id: 451459d8cb
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
5684a84a46
|
12.10.1-2 baseline
Former-commit-id: dde1f4c54d [formerly 250f0ccac9 ] [formerly dde1f4c54d [formerly 250f0ccac9 ] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: ec74f638e5 [formerly 34d2ddee9d ]
Former-commit-id: cc3c3dadee
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
03bb51ed0e
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60 ] [formerly c11f7d396e [formerly 36d80b1f60 ] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a ]
Former-commit-id: 8c5c5ad6eb
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
16d7d955fc
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218 ] [formerly 8309193ce9 [formerly 31ae7ea218 ] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416 ]
Former-commit-id: 63bcadf121
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
37f2b6e138
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca ] [formerly 7c064b6868 [formerly 2c0ff851ca ] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0 ]
Former-commit-id: d5fa61041b
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00 ] [formerly 8552902906 [formerly b13cbb7e00 ] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f ]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40 ] [formerly 580e2938d7 [formerly 66be3bec40 ] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484 ]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712 ] [formerly a02aeb236c [formerly 9f19e3f712 ] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f ]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|