Steve Harris
|
a8d7e2a51a
|
Merge branch '13.2.1_delivery' into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]]
Former-commit-id: ec56acde81
Former-commit-id: 41b14f0fa2 [formerly 73d9455c65] [formerly 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]]
Former-commit-id: 96b2d429acce04d3a7b895e5c4de0e318433555e [formerly a74d58ce6f]
Former-commit-id: 2107a54161
|
2013-01-31 10:19:14 -06:00 |
|
Steve Harris
|
3165545bb6
|
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]]
Former-commit-id: 6040272573
Former-commit-id: c9bc690eca [formerly 75f6e61e6f] [formerly 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]]
Former-commit-id: 97adf3dc9cd6eed17f75fee6569131485caea1a3 [formerly ba97151132]
Former-commit-id: 99bc358644
|
2013-01-29 15:57:21 -06:00 |
|
Steve Harris
|
d552dc5ffb
|
13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: 03989493ae [formerly daca1c3e73] [formerly aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]]
Former-commit-id: 4abc68d3bc26a4259383e44830f853678146e7ed [formerly dbaf4a3e39]
Former-commit-id: 9ab34b7aeb
|
2013-01-29 15:52:43 -06:00 |
|
Ron Anderson
|
16701b61e5
|
Issue #1535 Fix GFE saving last block of grids twice
Change-Id: I3411e27c96b5f0dd79c24e7ba75361582cb6652c
Former-commit-id: c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly c070b55324 [formerly ed7784818a] [formerly aa2c0ffb60] [formerly 5738910b71 [formerly aa2c0ffb60 [formerly 16eedd6d46196d08d02abc674c81ed95c403457c]]]]
Former-commit-id: 5738910b71
Former-commit-id: 5ffbbdd699 [formerly 670f23e1c2] [formerly 9ad86a93f01dfa8394e229e86a96b7f7e7dcd020 [formerly d61a24410a]]
Former-commit-id: 3ca45302a5e7a88786f8aa84decbcced74f9eb02 [formerly 3d1159c81f]
Former-commit-id: 96acf099c8
|
2013-01-28 19:23:23 -06:00 |
|
Steve Harris
|
379a9dd95c
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]]
Former-commit-id: 827611474f
Former-commit-id: 1397f8a811 [formerly a85c81289e] [formerly b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]]
Former-commit-id: f2d8f7cd1be3a2bba4584db2da805b450fce002a [formerly 895b25bac4]
Former-commit-id: a7d7847b06
|
2013-01-25 10:54:51 -06:00 |
|
Steve Harris
|
5d7a0ba9af
|
13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 0f4fcd0ba8 [formerly 251a9c0195] [formerly 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]]
Former-commit-id: a3e63c2bb7b23736c07cc90370ea39a5d96fd1a5 [formerly 27706b8dcb]
Former-commit-id: eafa141b90
|
2013-01-25 09:07:12 -06:00 |
|
Ron Anderson
|
1a2e4d477f
|
Issue #1524 Fix discrete color bar.
Former-commit-id: 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 001770beb7 [formerly 3d838584ed] [formerly 718f1da85b] [formerly 358c8bdf07 [formerly 718f1da85b [formerly 7edd57ef71e8a22aa25870477844ba063da0b9d3]]]]
Former-commit-id: 358c8bdf07
Former-commit-id: 250fd1d223 [formerly 6f7fa3e4e5] [formerly d49ec924e070578e004c1ea1c0c50d561de56ceb [formerly 3ccfdbc4bb]]
Former-commit-id: 19981c45dbc5b6d1e94c052f0ca8f7899de755b7 [formerly 01f80e2ff2]
Former-commit-id: 259871dfd8
|
2013-01-23 16:37:56 -06:00 |
|
David Gillingham
|
b03363cfc4
|
Issue #1515: Move blocking VCParm calls off of the ParmListener notification threads.
Change-Id: I1c3c46dde051802fb79b7ead6fb63d766d1d00a6
Former-commit-id: a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly a8bc4575bc [formerly eab83c0f63] [formerly bf6230441f] [formerly 88e518725e [formerly bf6230441f [formerly 9cd87997f7ae7b51608ac56fcdf4d282339526aa]]]]
Former-commit-id: 88e518725e
Former-commit-id: b96532e8ba [formerly faedefb85d] [formerly 9daae29bca1ae2c2c15295eb3aeae98bbeae7fa5 [formerly a1fd2bd32f]]
Former-commit-id: 502a3d2e982cabefa0c8afd0ea5107730be09c23 [formerly 5e6d400e79]
Former-commit-id: a4db386f6e
|
2013-01-23 10:09:39 -06:00 |
|
Steve Harris
|
4ed4f88644
|
Merge branch '13.2.1_delivery' into development
Former-commit-id: f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly f1b3a0ce2e [formerly cf384edfbb] [formerly 11b9bfc187] [formerly 1af055a04b [formerly 11b9bfc187 [formerly 920b282de84def082dac82832d80e67f7bff2b19]]]]
Former-commit-id: 1af055a04b
Former-commit-id: 7d6a1a7e3a [formerly 8b578c10dc] [formerly cdda32a5afb54d36ca6dc56ab5842aa9a04bf651 [formerly 29b9077291]]
Former-commit-id: f741fd6472c315f672ab76f7a397d383205c6f95 [formerly b03d5ce450]
Former-commit-id: c60051d5df
|
2013-01-22 16:45:48 -06:00 |
|
Ron Anderson
|
eeae7aa9ce
|
Issue #1518 Fixed unloading of D2D model parameters from Grid Manager and related issues with HashMaps with Parms as keys in GFELegendResource.
Change-Id: I483bbe92210ceb3015632d6a25d97ac35d7021a6
Former-commit-id: ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly ec31e7e2b5 [formerly 9a432a1153] [formerly ce3d102cf9] [formerly 3682a0e7f4 [formerly ce3d102cf9 [formerly 4f7a660ae3fba41240e032220b6599e652ae6750]]]]
Former-commit-id: 3682a0e7f4
Former-commit-id: eb41c05f54 [formerly 1062e54d2f] [formerly 6a1f7a195cac8a4aa1dc0ea06b509c23bb7d1264 [formerly 953f86348e]]
Former-commit-id: abb64f565a3863c0d0978b024482a211c0dd49c0 [formerly 48099589c0]
Former-commit-id: d0d1b62ab7
|
2013-01-22 16:12:16 -06:00 |
|
Ron Anderson
|
e528aaab4c
|
Issue #1504 GFE: Model data not always appearing automatically without CAVE restart
Change-Id: I1e52c111ec50a860a226d85bed6f0ab6dfebed58
Former-commit-id: 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 6f980bd582 [formerly 74cb9aeb53] [formerly 62671efc2a] [formerly 20b0761048 [formerly 62671efc2a [formerly 1fe63a2d5e20226f6124a9ca27b9f6272c49226c]]]]
Former-commit-id: 20b0761048
Former-commit-id: c74a5b5be3 [formerly 8e575db69c] [formerly f07e79b0f531baa1e312a1c9871c441ba527ac16 [formerly 44807ba0d5]]
Former-commit-id: 98d55e81fb58419062f53ea5506a70c8a9c2a3fb [formerly cb23960f0e]
Former-commit-id: 64d4baf536
|
2013-01-22 14:47:37 -06:00 |
|
Bryan Kowal
|
8fb4e9e6df
|
Fix the merge.
Former-commit-id: a3e78692dd [formerly 0858dfdfe4] [formerly fd7c132266] [formerly a3e78692dd [formerly 0858dfdfe4] [formerly fd7c132266] [formerly a66024e35b [formerly fd7c132266 [formerly 9f9da21517569f703c9e732016350b64ef14b98a]]]]
Former-commit-id: a66024e35b
Former-commit-id: 5202834703 [formerly 1e2a4b7801] [formerly 0f800038e8624a65589c41798356403705132ee7 [formerly 358132c3c4]]
Former-commit-id: ce4c1277606967c3425dfbe33f05603f79f9eca2 [formerly 61349238a4]
Former-commit-id: 91e8aa2419
|
2013-01-22 10:48:04 -06:00 |
|
Steve Harris
|
965abb3f7f
|
Merge branch '13.2.1_delivery' into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java
Former-commit-id: 2dac848e47 [formerly 340d2009f7] [formerly df9ac3685e] [formerly 2dac848e47 [formerly 340d2009f7] [formerly df9ac3685e] [formerly 3a772f41cf [formerly df9ac3685e [formerly a0bcc2276fb95097cfc10869f0aa1ee48189fc3a]]]]
Former-commit-id: 3a772f41cf
Former-commit-id: 05ab9613af [formerly 5b516ebb6f] [formerly ed7a2a2a47d2cbf073e1eafe635d1f605f03dbb6 [formerly 111d5afb3a]]
Former-commit-id: a9ae3ac17a7001b5d6ec36ad1097708b6ce2b469 [formerly 922d0493fb]
Former-commit-id: cae136ee16
|
2013-01-22 09:40:50 -06:00 |
|
Nate Jensen
|
dee084f8b0
|
Issue #1509 garbage collect after each procedure run
Change-Id: I7792d8bc186d6cef0fea38eccb657af040746fd7
Former-commit-id: c625919a82 [formerly c5d725bc7e] [formerly bd9123fb3a] [formerly c625919a82 [formerly c5d725bc7e] [formerly bd9123fb3a] [formerly add161ae2f [formerly bd9123fb3a [formerly fa239d3e7413c7441ba4440f0fe10f9e373de3df]]]]
Former-commit-id: add161ae2f
Former-commit-id: 7dd236b118 [formerly 414004fabf] [formerly 1fd87eebbb9f0f27ae7182f186b0c4c4f5b439bd [formerly 633af5e497]]
Former-commit-id: 1b8a19a6cba949ac6e7d079110ecac30dc39303e [formerly 1a1eb9bf3b]
Former-commit-id: 152a94adf4
|
2013-01-21 09:26:43 -06:00 |
|
David Gillingham
|
8664cd3ab3
|
Issue #1486: Commit initial implementation of a generic PythonScript controller class based on GFE's AbstractGfePyController, refactor GFE code to use it.
Change-Id: I6d04b58fea98c6e4ef032b4867969b8a01e258bc
Former-commit-id: de3e72065e [formerly 9e3999a427] [formerly c6e64d83a2] [formerly de3e72065e [formerly 9e3999a427] [formerly c6e64d83a2] [formerly d16760c73e [formerly c6e64d83a2 [formerly f54f775fa2bb89663e308feb79f5e188dbdd4cb4]]]]
Former-commit-id: d16760c73e
Former-commit-id: c8ec47e58f [formerly 09836dacca] [formerly b5a1c4056953f024797af353d21b532b9cabd412 [formerly a40383de3b]]
Former-commit-id: fd6f5c616a65425a268536b21b546c4412387a41 [formerly 74bd042c3f]
Former-commit-id: 9266b39ced
|
2013-01-17 17:42:05 -06:00 |
|
Roger Ferrel
|
815dd12ad9
|
Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.
Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650
Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]]
Former-commit-id: 1e492b81ff
Former-commit-id: 96deac5f43 [formerly 86d51634dc] [formerly ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]]
Former-commit-id: 06cef0013d52ca86020642bf82ef1a6b6988048f [formerly 722708105f]
Former-commit-id: 0435636b1e
|
2013-01-16 16:53:29 -06:00 |
|
Richard Peter
|
0a55bcfd67
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d]
Former-commit-id: e838f2db25
|
2013-01-14 18:07:17 -06:00 |
|
Steve Harris
|
e5f32a2bbe
|
13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
|
2013-01-14 18:42:21 -05:00 |
|
Richard Peter
|
031bae3bfd
|
Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]]
Former-commit-id: b8e42dabc0
Former-commit-id: 9da3b7e2dd [formerly fa6247baf7] [formerly bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]]
Former-commit-id: 353348b43765265bcb9885b4db6864c6e23d0b07 [formerly 096134d917]
Former-commit-id: ef2dc06b69
|
2013-01-14 17:38:38 -06:00 |
|
Steve Harris
|
32c48861de
|
13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 13be9f8987 [formerly 7d0109a349] [formerly d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]]
Former-commit-id: 93a11a781554c0d3f113b98ce41624b35a753e8d [formerly 066c14dcd2]
Former-commit-id: 92f1e9416c
|
2013-01-11 16:19:07 -05:00 |
|
Richard Peter
|
7d529beed2
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
|
2013-01-09 17:55:05 -06:00 |
|
Steve Harris
|
3e63f280a2
|
13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
db5990243a
|
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]]
Former-commit-id: ce72ebb094
Former-commit-id: 88f9070c93 [formerly 15849ae72a] [formerly 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]]
Former-commit-id: 90d18a302d7bff79b3ebe72d11d8f08efc5f661a [formerly db24093e42]
Former-commit-id: 868acb808b
|
2012-12-11 08:56:54 -06:00 |
|
Steve Harris
|
179755f156
|
Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
|
2012-12-11 08:45:53 -06:00 |
|
Max Schenkelberg
|
68ab110a18
|
Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da
Former-commit-id: 9ed56d2a16 [formerly 72f31d5f0c] [formerly d833d917db] [formerly 9ed56d2a16 [formerly 72f31d5f0c] [formerly d833d917db] [formerly d7c9ac3b84 [formerly d833d917db [formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]]]
Former-commit-id: d7c9ac3b84
Former-commit-id: 0950126c48 [formerly d0e091312a] [formerly b7f1408e11e1d131d4a8f3404d8ff6a088ea47fd [formerly e27d415da5]]
Former-commit-id: 640eddb6b3bdd325d525eeba62ec3457b59270fe [formerly 1fbb76abfd]
Former-commit-id: 40f67f7e54
|
2012-12-07 11:44:46 -06:00 |
|
Ron Anderson
|
464ceb1658
|
Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06
Former-commit-id: 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]]
Former-commit-id: b6fcd999f4
Former-commit-id: 7c09ef9001 [formerly c5b3111795] [formerly a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b]]
Former-commit-id: 341f47a5a9d882b376fc4121ea445322390c9a2b [formerly 111c0495a4]
Former-commit-id: b02f3a733f
|
2012-12-06 17:02:56 -06:00 |
|
Max Schenkelberg
|
5d14a6278a
|
Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a
Former-commit-id: f9f8c75b79 [formerly 5693e567ef] [formerly 032b0948a4] [formerly f9f8c75b79 [formerly 5693e567ef] [formerly 032b0948a4] [formerly 2e1bb4f7c6 [formerly 032b0948a4 [formerly a4c781a6c57579f04413dc16a0b3937ac6ce72d4]]]]
Former-commit-id: 2e1bb4f7c6
Former-commit-id: 71d34ca33a [formerly 8974e33edc] [formerly bdf52e73976551873e82686836572d9d03b9024c [formerly 2e51e024b8]]
Former-commit-id: d9a18c713e9dd5823199b0d8f70a56e945947ee0 [formerly 37b94ec835]
Former-commit-id: d47f34fb45
|
2012-12-06 11:23:22 -06:00 |
|
Steve Harris
|
cedbde75e3
|
12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 79b0e973ef [formerly 69ab975fab] [formerly 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]]
Former-commit-id: 54c80ccffc60d6ee8a544b475ed12355b32a2f26 [formerly 190378beeb]
Former-commit-id: f8a9ae24cb
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
25facfa9a7
|
12.12.1-10 baseline
Former-commit-id: 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 268262da26 [formerly c7ec50d4f9] [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]]
Former-commit-id: 28018b8d9b
Former-commit-id: d2da55254b [formerly 8a41d325d2] [formerly e0830ae197e0ce5e3085d3fffa18fe7132792d42 [formerly 0c67cb78a3]]
Former-commit-id: b37b8565f1ec8f0e35f587d2337f734e0608c210 [formerly 8ada406bfe]
Former-commit-id: a10d7d3041
|
2012-12-06 09:12:15 -06:00 |
|
Max Schenkelberg
|
0a1a51c6ef
|
Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation
Amend: Fixed time matcher index error when no data is available in GFE
Change-Id: Ie222ba72cb3890d3dc32699828b45012cd1783e5
Former-commit-id: a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly a614307c95 [formerly b744ba68e0] [formerly 624cafb066] [formerly 1328deac56 [formerly 624cafb066 [formerly 974ef3068d48244ca622edc17045266cc34b6468]]]]
Former-commit-id: 1328deac56
Former-commit-id: c9f3a07ac0 [formerly 47c7518388] [formerly b86ec7c1b619648b5b662c8f776712e299e94036 [formerly c5536a9a84]]
Former-commit-id: 53e8d333e59bfe0fb923f0e1ef352a70cc918e0d [formerly b1c2bf1cc4]
Former-commit-id: a488900f51
|
2012-11-30 14:17:50 -06:00 |
|
Roger Ferrel
|
cfe190d1a7
|
Issue #1298 Plugin changes to get localization import of files to work for test procedures.
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d
Former-commit-id: 3e7d2cc03c [formerly ac09c59d38] [formerly 2a1024ff50] [formerly 3e7d2cc03c [formerly ac09c59d38] [formerly 2a1024ff50] [formerly 230e24addc [formerly 2a1024ff50 [formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]]]
Former-commit-id: 230e24addc
Former-commit-id: 588a4f7da3 [formerly 0011eb0ff4] [formerly b6c45933b44d7827fbc20bcfd0aa6e32b0594cee [formerly ea3b2aebc6]]
Former-commit-id: a51946ac8b8444c59ae1a309dcaf09482cfb124a [formerly 2cc1b72f9e]
Former-commit-id: bb21c0b2f7
|
2012-11-27 10:37:06 -06:00 |
|
Roger Ferrel
|
1434078488
|
Issue #1298 Changes for non-blocking SelectionDlg.
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b
Former-commit-id: 3087efb2e0 [formerly 5f3fab4677] [formerly 00693d83bb] [formerly 3087efb2e0 [formerly 5f3fab4677] [formerly 00693d83bb] [formerly 59181213a0 [formerly 00693d83bb [formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]]]
Former-commit-id: 59181213a0
Former-commit-id: c2ccf9dd90 [formerly d0cdc594f8] [formerly c9f30770363ef819d269136eb35a07599220439c [formerly fdfcb2ebea]]
Former-commit-id: 450d4e6ceac61771c28c73b3f3337fb38ef4d012 [formerly e424cb4bf2]
Former-commit-id: 619197cbb2
|
2012-11-15 12:55:49 -06:00 |
|
Roger Ferrel
|
95711528ad
|
Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455
Former-commit-id: 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly 8cce309a6e [formerly fc87eccb77] [formerly a6fdc7b580] [formerly acf1881cb7 [formerly a6fdc7b580 [formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]]]
Former-commit-id: acf1881cb7
Former-commit-id: 4b6c5bc2d3 [formerly 8881e4d3ec] [formerly 092e0c8e86fd9af48cdabc168fe255b8d961546d [formerly d6c5839e0e]]
Former-commit-id: 8753a2bf60a5a6a69df5eac63b7ac9f764b8df27 [formerly 265adb9b1c]
Former-commit-id: aeb27b3c88
|
2012-11-14 16:33:27 -06:00 |
|
Lee Venable
|
11fff1b8a9
|
Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
Former-commit-id: 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 2c82bf1184 [formerly 6152ecccda] [formerly 695cf85335] [formerly 6134e5d3f7 [formerly 695cf85335 [formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]]]
Former-commit-id: 6134e5d3f7
Former-commit-id: e32f3dec10 [formerly d82072b975] [formerly 5f410f0507be8de6ebdea359793b084ce6d0667a [formerly 7ed335793f]]
Former-commit-id: fd8ba36786cde6648c7dcd2507759b25826950f3 [formerly 3369913a84]
Former-commit-id: f3cf44ffb4
|
2012-11-14 16:06:02 -06:00 |
|
Roger Ferrel
|
cfd0219849
|
Issue #1298 Changes for non-blocking DisplayAttributesDialog.
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d
Former-commit-id: 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 08919ea541 [formerly 82f9c74bef] [formerly 7ca75756ae] [formerly 212045c1a6 [formerly 7ca75756ae [formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]]]
Former-commit-id: 212045c1a6
Former-commit-id: 27b63206b7 [formerly 7f33d6ba18] [formerly fe1b8540deb8623751c11b171ed8881812641aa8 [formerly d069f186e1]]
Former-commit-id: 595a95d4a2e9268a01bcd2a146917008b3ea53c6 [formerly 9cf45444c3]
Former-commit-id: 9a04b3847b
|
2012-11-14 14:56:42 -06:00 |
|
Roger Ferrel
|
d886446fd8
|
Issue #1298 Changes for non-blocking TEWxSetValueDialog.
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b
Former-commit-id: cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly cac846718a [formerly 679d967382] [formerly 7f22145bf2] [formerly dd8f8a9fa7 [formerly 7f22145bf2 [formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 086f464e38 [formerly 56ed69fc83] [formerly 9c581c148e8a0d69f42133e580578c5ccbd32780 [formerly 89653eb5e1]]
Former-commit-id: 789d2bb255666f1d1de0f8dd7cc54d54cc11ef0e [formerly eb20af7237]
Former-commit-id: 52425e6b99
|
2012-11-14 14:20:40 -06:00 |
|
Roger Ferrel
|
3da9e354ef
|
Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8
Former-commit-id: a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly a49ee93898 [formerly 62faa06ddf] [formerly e267248b57] [formerly 2331b8e1f5 [formerly e267248b57 [formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]]]
Former-commit-id: 2331b8e1f5
Former-commit-id: 33cd82df5c [formerly ce623db367] [formerly f3b0d96220d8990a788ce98360553eaaec46477f [formerly 3f0dc83f89]]
Former-commit-id: f8a232315a21dff3d1fc6aebae60af3f68f041c1 [formerly 55b052c849]
Former-commit-id: 51b30ca9b5
|
2012-11-14 14:02:01 -06:00 |
|
Lee Venable
|
9ea463500b
|
Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
Former-commit-id: 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly 68a58d808a [formerly a6e88a6856] [formerly e755889643] [formerly e9ae25e781 [formerly e755889643 [formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]]]
Former-commit-id: e9ae25e781
Former-commit-id: 0f3fb27af1 [formerly 680373301f] [formerly 298e4f53220a5c54f7602fa97c954e24234058eb [formerly 09591687a9]]
Former-commit-id: 1403991e984897e87d6f3d04391b121fc1204131 [formerly 9cbd7cdcbe]
Former-commit-id: 12e2e49950
|
2012-11-14 13:30:42 -06:00 |
|
Roger Ferrel
|
2f56256eb8
|
Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072
Former-commit-id: a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly a8453f1f81 [formerly 7f3d893c84] [formerly d16a448e05] [formerly 590eca2cba [formerly d16a448e05 [formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]]]
Former-commit-id: 590eca2cba
Former-commit-id: f954d3dbe5 [formerly 78422d9893] [formerly 8bfed4f98086bca15c0c91bc03d65765d14477ce [formerly 950300e16d]]
Former-commit-id: 5109692e005e1bf78b156e94f1028cd351020468 [formerly a39abc035b]
Former-commit-id: 51e6ed0bcb
|
2012-11-14 12:04:18 -06:00 |
|
Roger Ferrel
|
a19864da10
|
Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
Changes from reviewer comments.
Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac
Former-commit-id: 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly 4424131662 [formerly 5e805da0e1] [formerly 049ecefe1d] [formerly b32480ed08 [formerly 049ecefe1d [formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]]]
Former-commit-id: b32480ed08
Former-commit-id: ffefe1fe90 [formerly be24ca5ed6] [formerly 488a54e8e90966466526378b7880051a98a03d8f [formerly af0ad0433b]]
Former-commit-id: 1a8432622a51776a62fa26692467b1aa2e8e42ff [formerly bdeb05acbb]
Former-commit-id: d5e0266a5e
|
2012-11-14 11:36:52 -06:00 |
|
Steve Harris
|
b5fd6ed2fd
|
Merge branch 'ss_builds' (12.12.1-3) into development
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217]
Former-commit-id: ae9d9985cd
|
2012-11-13 17:28:50 -06:00 |
|
Steve Harris
|
9e4dbe2640
|
12.12.1-2 baseline
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
|
2012-11-13 17:14:24 -06:00 |
|
Lee Venable
|
1716ce4706
|
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
Former-commit-id: 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly 4320165247 [formerly 2827143110] [formerly 989d5dc5e4] [formerly dbdfda1d04 [formerly 989d5dc5e4 [formerly 7f22292e89e05b881466efd1d81ef851c454246a]]]]
Former-commit-id: dbdfda1d04
Former-commit-id: 4c936e9bb8 [formerly 77af9b8699] [formerly a654acdd7cf3477fb8a44e9b6bf136dee6be7b3d [formerly 282e8858da]]
Former-commit-id: 39a32350f8aad475612690d01a1181af0a42bb21 [formerly 5f79e0f562]
Former-commit-id: 4353b75410
|
2012-11-13 16:02:05 -06:00 |
|
Steve Harris
|
ccddf90d74
|
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
Former-commit-id: 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5569785336 [formerly 1f1659cb16] [formerly 63b0f18a89] [formerly 5c23f057b3 [formerly 63b0f18a89 [formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]]]
Former-commit-id: 5c23f057b3
Former-commit-id: 7abc2601da [formerly 6db07e2e5e] [formerly b9c2ea0185e67881a053d4f784a50c258b57989c [formerly 1e0ad343d6]]
Former-commit-id: 5b2963e196fa2df8ead47999d773eb0a16ae2a62 [formerly 07abe90d1c]
Former-commit-id: 81015f6f41
|
2012-11-13 16:02:03 -06:00 |
|
Ben Steffensmeier
|
b57a30d18d
|
Merge branch 'ss_builds'(12.12.1-1) into development
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/DefineRefSetDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/FormatterLauncherDialog.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GribDataCubeAlertMessageParser.java
edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-request.xml
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/dao/GribDao.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleSet.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/purge/PurgeRuleTree.java
edexOsgi/com.raytheon.uf.tools.cli/impl/src/purgeallmodeldata/purgeAllModelData.py
pythonPackages/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py
Change-Id: Iefdb4f7ba08dc052250d432bb0363a9f83031fcc
Former-commit-id: 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly 626f398224 [formerly ed4f88aa22] [formerly 69fc030bb4] [formerly e8090e654b [formerly 69fc030bb4 [formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]]]
Former-commit-id: e8090e654b
Former-commit-id: fa599c93a8 [formerly 109ec1e778] [formerly 5df39335de7af8262df41e9b6116647d8d9986f5 [formerly 60f78c22e3]]
Former-commit-id: 1922ebb0208920ac3ef27814907ade54d1a0244a [formerly 7761060a12]
Former-commit-id: 9f2f2591ee
|
2012-11-13 16:00:19 -06:00 |
|
Roger Ferrel
|
2ad77ad5af
|
Issue #1298 Changes for non-blocking SetValueDialog.
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly f9265a7f55 [formerly cbacc77367] [formerly 1d5bd95866] [formerly dceb2cde5d [formerly 1d5bd95866 [formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]]]
Former-commit-id: dceb2cde5d
Former-commit-id: 12ad9f9732 [formerly c498e21b23] [formerly 064d919288c957d602a2f2cbce59be833dac3237 [formerly 29eb436b19]]
Former-commit-id: 1d576bb378acf793b8153df70fc725f7aa86fb57 [formerly 0b8ecada1b]
Former-commit-id: de65e19817
|
2012-11-13 15:53:03 -06:00 |
|
Roger Ferrel
|
318a56771a
|
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly 9ec6ee1fe4 [formerly 6f6b9dd21a] [formerly 1e8dfdc857] [formerly b421a30116 [formerly 1e8dfdc857 [formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]]]
Former-commit-id: b421a30116
Former-commit-id: dce9814cc7 [formerly 1272837397] [formerly 9fb3810dd061a915575be1fa8b5d2e12821cf89c [formerly d646f32d6e]]
Former-commit-id: 598844707b6924bafba9f9d28c39f879556aa343 [formerly 3eb1da1b66]
Former-commit-id: 295c73d59e
|
2012-11-13 13:20:28 -06:00 |
|
Roger Ferrel
|
fa64ad879e
|
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly e82a2e2d5c [formerly fdfa0f2030] [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 5ce67ffd9e [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]]
Former-commit-id: ae52206cc7
Former-commit-id: e4283e3ccd [formerly 122a5cf0a4] [formerly e30f66c230e0ca09d4cf1ce286c67a28b4b91763 [formerly 30c70cc181]]
Former-commit-id: 3709ef12351e9d79d8edef04d9bb2919d7e91d9d [formerly d31e866744]
Former-commit-id: 58dc77407c
|
2012-11-13 09:49:16 -06:00 |
|
Roger Ferrel
|
25370d4e80
|
Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly 5f0a583d86 [formerly ab77dfa758] [formerly 66606f88de] [formerly e982c0f43a [formerly 66606f88de [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]]
Former-commit-id: e982c0f43a
Former-commit-id: 4f08c126b6 [formerly 3b07bb1ae6] [formerly bad97768d4ebf7b70752c8307f99e51df3dd9fe0 [formerly de21a3f2ef]]
Former-commit-id: 2f7bf56cdf35e135b2334c51978e89aa272307ed [formerly d9c7c4ae56]
Former-commit-id: 3bc3bf17fd
|
2012-11-12 16:27:08 -06:00 |
|