Richard Peter
cd2014bf8d
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: 3fb7d96ec1
[formerly 3fb7d96ec1
[formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
2013-01-14 18:07:17 -06:00
Steve Harris
ebff2a6275
13.2.1-1 baseline
...
Former-commit-id: e62172c8c7
[formerly e62172c8c7
[formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
2013-01-14 18:42:21 -05:00
Richard Peter
096134d917
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: 1318f53902
[formerly 1318f53902
[formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: b8e42dabc0
Former-commit-id: aa9e16b038
2013-01-14 17:38:38 -06:00
Steve Harris
066c14dcd2
13.1.2-8 baseline
...
Former-commit-id: e6217a17de
[formerly e6217a17de
[formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 3caf592e83
2013-01-11 16:19:07 -05:00
Richard Peter
709af3b25e
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 029ebaa63a
[formerly 029ebaa63a
[formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
2013-01-09 17:55:05 -06:00
Steve Harris
05bdc0ecd2
13.1.2-6 baseline
...
Former-commit-id: 8e5f9e0e6c
[formerly 8e5f9e0e6c
[formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
2013-01-06 14:55:11 -06:00
Steve Harris
b6fa9b4858
13.1.2-2 baseline
...
Former-commit-id: c0c1d56f3a
[formerly c0c1d56f3a
[formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Steve Harris
db24093e42
Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
...
Former-commit-id: ab8b1ae64d
[formerly ab8b1ae64d
[formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]
Former-commit-id: ce72ebb094
Former-commit-id: 113fdcb679
2012-12-11 08:56:54 -06:00
Steve Harris
ebcc9975c4
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: 43ddfe98c4
[formerly 43ddfe98c4
[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
2012-12-11 08:45:53 -06:00
Max Schenkelberg
1fbb76abfd
Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
...
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da
Former-commit-id: d833d917db
[formerly d833d917db
[formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]
Former-commit-id: d7c9ac3b84
Former-commit-id: e27d415da5
2012-12-07 11:44:46 -06:00
Ron Anderson
111c0495a4
Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
...
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06
Former-commit-id: bb163074fa
[formerly bb163074fa
[formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]
Former-commit-id: b6fcd999f4
Former-commit-id: 70cca3900b
2012-12-06 17:02:56 -06:00
Max Schenkelberg
37b94ec835
Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
...
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a
Former-commit-id: 032b0948a4
[formerly 032b0948a4
[formerly a4c781a6c57579f04413dc16a0b3937ac6ce72d4]]
Former-commit-id: 2e1bb4f7c6
Former-commit-id: 2e51e024b8
2012-12-06 11:23:22 -06:00
Steve Harris
190378beeb
12.12.1-12 baseline
...
Former-commit-id: e8e41630e8
[formerly e8e41630e8
[formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
2012-12-06 09:18:28 -06:00
Steve Harris
8ada406bfe
12.12.1-10 baseline
...
Former-commit-id: 45f5150eb6
[formerly 45f5150eb6
[formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]
Former-commit-id: 28018b8d9b
Former-commit-id: 0c67cb78a3
2012-12-06 09:12:15 -06:00
Max Schenkelberg
b1c2bf1cc4
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: 624cafb066
[formerly 624cafb066
[formerly 974ef3068d48244ca622edc17045266cc34b6468]]
Former-commit-id: 1328deac56
Former-commit-id: c5536a9a84
2012-11-30 14:17:50 -06:00
Roger Ferrel
2cc1b72f9e
Issue #1298 Plugin changes to get localization import of files to work for test procedures.
...
Change-Id: I91e5e5abc76789f0b65ebc2dc7c793f7afa32d7d
Former-commit-id: 2a1024ff50
[formerly 2a1024ff50
[formerly 67b55ee03d17a878375be75bc36bcb5500ca98fd]]
Former-commit-id: 230e24addc
Former-commit-id: ea3b2aebc6
2012-11-27 10:37:06 -06:00
Roger Ferrel
e424cb4bf2
Issue #1298 Changes for non-blocking SelectionDlg.
...
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b
Former-commit-id: 00693d83bb
[formerly 00693d83bb
[formerly cd85c4e60fd3863c39a7c61ad73848207e196a05]]
Former-commit-id: 59181213a0
Former-commit-id: fdfcb2ebea
2012-11-15 12:55:49 -06:00
Roger Ferrel
265adb9b1c
Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
...
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455
Former-commit-id: a6fdc7b580
[formerly a6fdc7b580
[formerly dd80807a0469e7c677f8e0d214fcdec715c67518]]
Former-commit-id: acf1881cb7
Former-commit-id: d6c5839e0e
2012-11-14 16:33:27 -06:00
Lee Venable
3369913a84
Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
...
Former-commit-id: 695cf85335
[formerly 695cf85335
[formerly 33b0aada5191fd6a757f37029862cdcadf8c0692]]
Former-commit-id: 6134e5d3f7
Former-commit-id: 7ed335793f
2012-11-14 16:06:02 -06:00
Roger Ferrel
9cf45444c3
Issue #1298 Changes for non-blocking DisplayAttributesDialog.
...
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d
Former-commit-id: 7ca75756ae
[formerly 7ca75756ae
[formerly 260f5085bba45ab5b3ad10dd3945a64195eb2d7b]]
Former-commit-id: 212045c1a6
Former-commit-id: d069f186e1
2012-11-14 14:56:42 -06:00
Roger Ferrel
eb20af7237
Issue #1298 Changes for non-blocking TEWxSetValueDialog.
...
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b
Former-commit-id: 7f22145bf2
[formerly 7f22145bf2
[formerly f489ae636459e2dfcf7092d0ede7a37e84398cb2]]
Former-commit-id: dd8f8a9fa7
Former-commit-id: 89653eb5e1
2012-11-14 14:20:40 -06:00
Roger Ferrel
55b052c849
Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
...
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8
Former-commit-id: e267248b57
[formerly e267248b57
[formerly 5c0eef28a67b874f184fd391d9220957030e43c7]]
Former-commit-id: 2331b8e1f5
Former-commit-id: 3f0dc83f89
2012-11-14 14:02:01 -06:00
Lee Venable
9cbd7cdcbe
Merge "Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog." into development
...
Former-commit-id: e755889643
[formerly e755889643
[formerly dbb1bc97d99827f7e97039f7a333ae0fc00353f0]]
Former-commit-id: e9ae25e781
Former-commit-id: 09591687a9
2012-11-14 13:30:42 -06:00
Roger Ferrel
a39abc035b
Issue #1298 Convert UserEntryDialog to CaveSWTDialog but keep it a blocking dialog.
...
Change-Id: I5c2ae63c0461d5e3e96a050c0055a625b1271072
Former-commit-id: d16a448e05
[formerly d16a448e05
[formerly eadf4e9a28df6687a8e0bee6c6cef74356cd26d7]]
Former-commit-id: 590eca2cba
Former-commit-id: 950300e16d
2012-11-14 12:04:18 -06:00
Roger Ferrel
bdeb05acbb
Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
...
Changes from reviewer comments.
Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac
Former-commit-id: 049ecefe1d
[formerly 049ecefe1d
[formerly d8b828e6bc0a47caa01165cdb22e87f301534e30]]
Former-commit-id: b32480ed08
Former-commit-id: af0ad0433b
2012-11-14 11:36:52 -06:00
Steve Harris
59efd9a217
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 448dd1c35f
[formerly 448dd1c35f
[formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]
Former-commit-id: 00f3d51546
Former-commit-id: c8cac52915
2012-11-13 17:28:50 -06:00
Steve Harris
96a4a4f3f5
12.12.1-2 baseline
...
Former-commit-id: a8560580f8
[formerly a8560580f8
[formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
2012-11-13 17:14:24 -06:00
Lee Venable
5f79e0f562
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: 989d5dc5e4
[formerly 989d5dc5e4
[formerly 7f22292e89e05b881466efd1d81ef851c454246a]]
Former-commit-id: dbdfda1d04
Former-commit-id: 282e8858da
2012-11-13 16:02:05 -06:00
Steve Harris
07abe90d1c
Merge "Merge branch 'ss_builds'(12.12.1-1) into development" into development
...
Former-commit-id: 63b0f18a89
[formerly 63b0f18a89
[formerly b0c071ca9877eb73e312a530d6abb94563cbc980]]
Former-commit-id: 5c23f057b3
Former-commit-id: 1e0ad343d6
2012-11-13 16:02:03 -06:00
Ben Steffensmeier
7761060a12
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: 69fc030bb4
[formerly 69fc030bb4
[formerly 911c845199714c07e93f9847ab00fcd6d28a4223]]
Former-commit-id: e8090e654b
Former-commit-id: 60f78c22e3
2012-11-13 16:00:19 -06:00
Roger Ferrel
0b8ecada1b
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: 1d5bd95866
[formerly 1d5bd95866
[formerly 5c94dd5727420ff612ff1fa5bbdb06a041e89459]]
Former-commit-id: dceb2cde5d
Former-commit-id: 29eb436b19
2012-11-13 15:53:03 -06:00
Roger Ferrel
3eb1da1b66
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 1e8dfdc857
[formerly 1e8dfdc857
[formerly 149198a0ab46b58518edb02c1bfb19e2f432726c]]
Former-commit-id: b421a30116
Former-commit-id: d646f32d6e
2012-11-13 13:20:28 -06:00
Roger Ferrel
d31e866744
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: 5ce67ffd9e
[formerly 5ce67ffd9e
[formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]
Former-commit-id: ae52206cc7
Former-commit-id: 30c70cc181
2012-11-13 09:49:16 -06:00
Roger Ferrel
d9c7c4ae56
Issue #1298 Changes for non-blocking WrapLengthDialog.
...
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: 66606f88de
[formerly 66606f88de
[formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]
Former-commit-id: e982c0f43a
Former-commit-id: de21a3f2ef
2012-11-12 16:27:08 -06:00
Roger Ferrel
3ebaaa8992
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 6445081aa9
[formerly 6445081aa9
[formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]
Former-commit-id: 76109f3bf7
Former-commit-id: e7cd99ff0d
2012-11-12 15:26:03 -06:00
Roger Ferrel
6b0c3820d8
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 9c9a068908
[formerly 9c9a068908
[formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]
Former-commit-id: f48474fc82
Former-commit-id: b11413b7f0
2012-11-12 14:22:02 -06:00
Lee Venable
92063028bc
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: ab62adea95
[formerly ab62adea95
[formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]
Former-commit-id: 7db247e33a
Former-commit-id: ded0bfb92f
2012-11-12 14:13:06 -06:00
Lee Venable
0a39d42de1
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 879078484e
[formerly 879078484e
[formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]
Former-commit-id: 62c42850e8
Former-commit-id: 4f26da9a9a
2012-11-12 14:09:44 -06:00
Roger Ferrel
4f86b0b521
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 3676829e8f
[formerly 3676829e8f
[formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]
Former-commit-id: ee323d9c60
Former-commit-id: 73d9e78e92
2012-11-12 13:20:05 -06:00
Roger Ferrel
df5b8485c6
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: 30ef939e3c
[formerly 30ef939e3c
[formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]
Former-commit-id: 438731ca2e
Former-commit-id: 195d876753
2012-11-12 12:00:03 -06:00
Roger Ferrel
26afb7f186
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: d89ce26aeb
[formerly d89ce26aeb
[formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]
Former-commit-id: d489a7ef9f
Former-commit-id: e01a4ae243
2012-11-12 07:14:15 -06:00
Roger Ferrel
f13bedab32
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: e26b14a84d
[formerly e26b14a84d
[formerly a2a52b7754d831406e591763930f419def7cb1eb]]
Former-commit-id: 89617dda68
Former-commit-id: 05825bd6f3
2012-11-08 11:19:51 -06:00
Lee Venable
b3991fa4c9
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: be460c956e
[formerly be460c956e
[formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]
Former-commit-id: e791e73a30
Former-commit-id: 7b5f085643
2012-11-08 11:11:15 -06:00
Lee Venable
3bdfe02fe3
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
...
Former-commit-id: ff5083715b
[formerly ff5083715b
[formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]
Former-commit-id: c44f90f675
Former-commit-id: 4a22ded443
2012-11-08 10:57:45 -06:00
Roger Ferrel
062109f9a7
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
...
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: dfb55edb3d
[formerly dfb55edb3d
[formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]
Former-commit-id: eae8a68fd5
Former-commit-id: 24a2e79b28
2012-11-08 10:54:41 -06:00
Roger Ferrel
bf4c19927c
Issue #1298 Changes for non-blocking FuzzValueDialog.
...
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 023252fb84
[formerly 023252fb84
[formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]
Former-commit-id: c3f451f799
Former-commit-id: de534f5b43
2012-11-08 08:24:38 -06:00
Roger Ferrel
3aa144b2df
Issue #1298 Chnages for non-blocking FindReplaceDlg.
...
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 76f60240c5
[formerly 76f60240c5
[formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]
Former-commit-id: 199475f671
Former-commit-id: e072532a77
2012-11-08 07:57:56 -06:00
Lee Venable
139ca20a3c
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
...
Former-commit-id: 36c44db46b
[formerly 36c44db46b
[formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]
Former-commit-id: 8956718961
Former-commit-id: eacc1ca32c
2012-11-07 17:38:21 -06:00
Roger Ferrel
f2f0d2320f
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
...
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: a46535ee0c
[formerly a46535ee0c
[formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]
Former-commit-id: 65d10be5d6
Former-commit-id: 35f3a3953c
2012-11-07 15:07:47 -06:00
Roger Ferrel
1d7ee19deb
Issue #1298 Changes for non-blocking CallToActionsDlg.
...
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc
Former-commit-id: 190922a233
[formerly 190922a233
[formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]
Former-commit-id: 81de6cd45b
Former-commit-id: d6560d7730
2012-11-07 14:35:38 -06:00