Lee Venable
4745a2d434
Merge "Issue #1298 Changes for non-blocking GhgAlertDlg." into development
...
Former-commit-id: 3eba3cc1e6eb297f00fc0540d84e4e3eba3cc1e6eb297f00fc0540d84e4e40f11cfba50540d84e4e40f11cfba5f246c5746c247a2859caaa4b1f49709bef16f8ab84ac6354e8
2012-11-15 17:43:31 -06:00
Max Schenkelberg
f980bf1d4f
Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
...
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737
Former-commit-id: a40abfda65a472f5535b655f54b098a40abfda65a472f5535b655f54b098f540f65fd7655f54b098f540f65fd7d86550c239db2fe0b5e8f1866b2e497ffce5cd45a94b9c173d
2012-11-15 16:21:42 -06:00
Roger Ferrel
c67b4704a5
Issue #1298 Changes for non-blocking GhgAlertDlg.
...
Change-Id: I1da7317ad69203a4160c806458fdbf99a7d9108d
Former-commit-id: 7811b44376b66bc0210a800c1a69087811b44376b66bc0210a800c1a6908c0554d9686800c1a6908c0554d9686273f68e6bf0a1133219305f32527bd342a35599bf805c4cccd
2012-11-15 15:51:46 -06:00
Roger Ferrel
5651e6cf94
Issue #1298 Changes for non-blocking GhgMonitorDlg.
...
Change-Id: I69a05b6d62e8d75c998b6cb9059c9f45e6cf39d3
Former-commit-id: 07cc6ec003a29b52ca8cdc82ad820b07cc6ec003a29b52ca8cdc82ad820b109dea21e1dc82ad820b109dea21e176d9479fb9e35d7b3f152206167b00418dd35a9d64ae20f4a9
2012-11-15 14:37:29 -06:00
Roger Ferrel
1434078488
Issue #1298 Changes for non-blocking SelectionDlg.
...
Change-Id: I9829945037f8f5ce268eb3731302ae77e83d837b
Former-commit-id: 3087efb2e05f3fab467700693d83bb3087efb2e05f3fab467700693d83bb59181213a000693d83bb59181213a0c2ccf9dd90d0cdc594f8fdfcb2ebeae424cb4bf2619197cbb2
2012-11-15 12:55:49 -06:00
Roger Ferrel
95711528ad
Issue #1298 Changes for non-blocking MoveWeatherElementDialog.
...
Change-Id: I5f41c52d45146a0e9cdfbf613ec3918382f6a455
Former-commit-id: 8cce309a6efc87eccb77a6fdc7b5808cce309a6efc87eccb77a6fdc7b580acf1881cb7a6fdc7b580acf1881cb74b6c5bc2d38881e4d3ecd6c5839e0e265adb9b1caeb27b3c88
2012-11-14 16:33:27 -06:00
Max Schenkelberg
ecde93e6fc
Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
...
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.
Amend: Rebased
Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567
Former-commit-id: 61f0c0501bfe11e31bfbdcde9e895161f0c0501bfe11e31bfbdcde9e895128e61c8285dcde9e895128e61c828591607fb03e5aa26e4f132e20c3e799429ddc7312eec401909b
2012-11-14 16:19:37 -06:00
Nate Jensen
1929f50b1b
Merge "Issue #189 fix contour subgridding for worldwide grids" into development
...
Former-commit-id: 38b27d23afee7daccb2c5055164f5538b27d23afee7daccb2c5055164f55340f8e1fa85055164f55340f8e1fa803192766ba721ef4452d6210f94be185fdcaf8543caa746f20
2012-11-14 16:09:51 -06:00
Lee Venable
11fff1b8a9
Merge "Issue #1298 Changes for non-blocking DisplayAttributesDialog." into development
...
Former-commit-id: 2c82bf11846152ecccda695cf853352c82bf11846152ecccda695cf853356134e5d3f7695cf853356134e5d3f7e32f3dec10d82072b9757ed335793f3369913a84f3cf44ffb4
2012-11-14 16:06:02 -06:00
Lee Venable
aa93fdbc1d
Merge "Issue #1298 Changes for non-blocking TEWxSetValueDialog." into development
...
Former-commit-id: 39972763e464d9ba91848fa3d794fd39972763e464d9ba91848fa3d794fdedfab7e56f8fa3d794fdedfab7e56fe251942c812f4b1d9d5fbbba9b1b299c177ca2c98f20559063
2012-11-14 16:05:20 -06:00
Roger Ferrel
cfd0219849
Issue #1298 Changes for non-blocking DisplayAttributesDialog.
...
Change-Id: I2175023db40ad6b24c47ebc2cd16e12572fb1b6d
Former-commit-id: 08919ea54182f9c74bef7ca75756ae08919ea54182f9c74bef7ca75756ae212045c1a67ca75756ae212045c1a627b63206b77f33d6ba18d069f186e19cf45444c39a04b3847b
2012-11-14 14:56:42 -06:00
Dustin Johnson
c6dbe1bc0c
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 069c8d4788d27bce13c2bff32bbe58069c8d4788d27bce13c2bff32bbe580d1d663f41bff32bbe580d1d663f4108fd67e94a5d5dbe27e1e25b7c312bff336432346d21c445c2
2012-11-14 14:41:57 -06:00
Roger Ferrel
d886446fd8
Issue #1298 Changes for non-blocking TEWxSetValueDialog.
...
Change-Id: I2d46c885ef0aa7aa8019665e8822d62ed221be8b
Former-commit-id: cac846718a679d9673827f22145bf2cac846718a679d9673827f22145bf2dd8f8a9fa77f22145bf2dd8f8a9fa7086f464e3856ed69fc8389653eb5e1eb20af723752425e6b99
2012-11-14 14:20:40 -06:00
Steve Harris
ccb16b9b44
12.12.1-4 baseline
...
Former-commit-id: b968ab5135b91b7f0fae85130eb611b968ab5135b91b7f0fae85130eb61157578da52185130eb61157578da5214300583fc2e35a321a8c628ca9e5c6493f335c0b2c2bfc949d
2012-11-14 14:19:20 -06:00
Roger Ferrel
3da9e354ef
Issue #1298 Changes for non-blocking TEDiscreteSetValueDialog.
...
Change-Id: I4e015b94f20b5075c4dc22d2165718d02109e0a8
Former-commit-id: a49ee9389862faa06ddfe267248b57a49ee9389862faa06ddfe267248b572331b8e1f5e267248b572331b8e1f533cd82df5cce623db3673f0dc83f8955b052c84951b30ca9b5
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: 68a58d808aa6e88a6856e75588964368a58d808aa6e88a6856e755889643e9ae25e781e755889643e9ae25e7810f3fb27af1680373301f09591687a99cbd7cdcbe12e2e49950
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: a8453f1f817f3d893c84d16a448e05a8453f1f817f3d893c84d16a448e05590eca2cbad16a448e05590eca2cbaf954d3dbe578422d9893950300e16da39abc035b51e6ed0bcb
2012-11-14 12:04:18 -06:00
Ben Steffensmeier
d9c29bf16b
Issue #189 fix contour subgridding for worldwide grids
...
Former-commit-id: 3165998c1c33d07530c63ee95cff213165998c1c33d07530c63ee95cff21929a785e1b3ee95cff21929a785e1b8f5469f3a57de15734e976996706f4acd5002c941bf949a006
2012-11-14 11:38:25 -06:00
Roger Ferrel
a19864da10
Issue #1298 Changes for non-blocking WeatherElementGroupDialog.
...
Changes from reviewer comments.
Change-Id: Ib21a454575115f26da165704454caaa76d86b5ac
Former-commit-id: 44241316625e805da0e1049ecefe1d44241316625e805da0e1049ecefe1db32480ed08049ecefe1db32480ed08ffefe1fe90be24ca5ed6af0ad0433bbdeb05acbbd5e0266a5e
2012-11-14 11:36:52 -06:00
Steve Harris
b5fd6ed2fd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee89387488fc896f7d4448dd1c35f1ee89387488fc896f7d4448dd1c35f00f3d51546448dd1c35f00f3d5154698670f1cc221ecd53719c8cac5291559efd9a217ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
f21d879641
12.12.1-3 baseline
...
Former-commit-id: 48fa2a9106a81c46987bc999505fba48fa2a9106a81c46987bc999505fbab3b5e6d28fc999505fbab3b5e6d28f5f628acefd2e3662028f2797cbcdd0314495dc8e7058ebec23
2012-11-13 17:27:04 -06:00
Steve Harris
9e4dbe2640
12.12.1-2 baseline
...
Former-commit-id: 7192b19284ed809a02dba8560580f87192b19284ed809a02dba8560580f86868eb9b23a8560580f86868eb9b235365b72401111e7607cfdf89fe9bed96a4a4f3f553d74c66e7
2012-11-13 17:14:24 -06:00
Lee Venable
1716ce4706
Merge "Issue #1298 Changes for non-blocking SetValueDialog." into development
...
Former-commit-id: 43201652472827143110989d5dc5e443201652472827143110989d5dc5e4dbdfda1d04989d5dc5e4dbdfda1d044c936e9bb877af9b8699282e8858da5f79e0f5624353b75410
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: 55697853361f1659cb1663b0f18a8955697853361f1659cb1663b0f18a895c23f057b363b0f18a895c23f057b37abc2601da6db07e2e5e1e0ad343d607abe90d1c81015f6f41
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: 626f398224ed4f88aa2269fc030bb4626f398224ed4f88aa2269fc030bb4e8090e654b69fc030bb4e8090e654bfa599c93a8109ec1e77860f78c22e37761060a129f2f2591ee
2012-11-13 16:00:19 -06:00
Roger Ferrel
2ad77ad5af
Issue #1298 Changes for non-blocking SetValueDialog.
...
Change-Id: Ida7350ff46cadb910972043a3882ef8d0d6ba20f
Former-commit-id: f9265a7f55cbacc773671d5bd95866f9265a7f55cbacc773671d5bd95866dceb2cde5d1d5bd95866dceb2cde5d12ad9f9732c498e21b2329eb436b190b8ecada1bde65e19817
2012-11-13 15:53:03 -06:00
Lee Venable
0aa9ed1a70
Merge "Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg." into development
...
Former-commit-id: 65c0b3953e5b4f3c68f1c1e46f52ca65c0b3953e5b4f3c68f1c1e46f52ca9d149bef29c1e46f52ca9d149bef2957725df0a13d07136ccc32f088d98607c1a3b61bc79fb63b54
2012-11-13 15:35:13 -06:00
Roger Ferrel
318a56771a
Issue #1298 Changes for non-blocking SetDeltaDialog and removal of unused class ShowISCInfoDlg.
...
Change-Id: Icc9482b5e1063d6a4dcc33c106a582e8a460a6d0
Former-commit-id: 9ec6ee1fe46f6b9dd21a1e8dfdc8579ec6ee1fe46f6b9dd21a1e8dfdc857b421a301161e8dfdc857b421a30116dce9814cc71272837397d646f32d6e3eb1da1b66295c73d59e
2012-11-13 13:20:28 -06:00
Roger Ferrel
909a8285d0
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
...
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: 2209d4d650e3ae2eb35522f8bc10f02209d4d650e3ae2eb35522f8bc10f04c3af2a25822f8bc10f04c3af2a258af8fa780d2c1c0e53b2d8e85e1c8df1b582e49a6046da0519b
2012-11-13 12:55:33 -06:00
Roger Ferrel
fa64ad879e
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
...
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: e82a2e2d5cfdfa0f20305ce67ffd9ee82a2e2d5cfdfa0f20305ce67ffd9eae52206cc75ce67ffd9eae52206cc7e4283e3ccd122a5cf0a430c70cc181d31e86674458dc77407c
2012-11-13 09:49:16 -06:00
Nate Jensen
62d2ccbfa8
Merge "Issue #1324 make times display in 24 hour time" into development
...
Former-commit-id: dcff3f4711ca20259c168a07ba3c11dcff3f4711ca20259c168a07ba3c11e7045022ad8a07ba3c11e7045022ade6f79c3e2a2be953df6b7baf10fc53b4bfd198957be1809e99
2012-11-13 09:28:05 -06:00
Nate Jensen
6c6feff5ab
Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
...
Former-commit-id: 35ea1b7773254e88a70c8a1f3a10a435ea1b7773254e88a70c8a1f3a10a4e51d86ce3a8a1f3a10a4e51d86ce3a826c997e0b14b61ef0f8cf8fd9f731d94afa6a550f982fbf32
2012-11-12 17:16:07 -06:00
Lee Venable
65d9170e0d
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
...
Former-commit-id: ca88126428e62c2fb732a576274c3cca88126428e62c2fb732a576274c3cd4276e6474a576274c3cd4276e647470142d8fa5eaf7e7c724fb4b76b00385b200a973e383520c28
2012-11-12 16:58:17 -06:00
Max Schenkelberg
9de9bb8cb1
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
...
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 1ed5f1023030c1802398d1099addc61ed5f1023030c1802398d1099addc600822a4f39d1099addc600822a4f3925f5a9b1aa4408af827fc4e5092f949a13824af2c6b516ff9e
2012-11-12 16:46:21 -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: 5f0a583d86ab77dfa75866606f88de5f0a583d86ab77dfa75866606f88dee982c0f43a66606f88dee982c0f43a4f08c126b63b07bb1ae6de21a3f2efd9c7c4ae563bc3bf17fd
2012-11-12 16:27:08 -06:00
Roger Ferrel
9fe8203d77
Issue #1298 Changes for non-blocking StoreTransmitDlg.
...
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: e6030885a113c0fb3f3d6445081aa9e6030885a113c0fb3f3d6445081aa976109f3bf76445081aa976109f3bf74a8b71a63201899535e3e7cd99ff0d3ebaaa8992a3608d98fd
2012-11-12 15:26:03 -06:00
Ben Steffensmeier
e93dcd17d2
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
...
Former-commit-id: dfe697a59c65441372df7d3f479031dfe697a59c65441372df7d3f479031b5b472dee17d3f479031b5b472dee158ba7be711810e0abd77220f41ec4c94d44ed44019f9437de6
2012-11-12 15:15:49 -06:00
Roger Ferrel
16a23467c4
Issue #1298 Changes for non-blocking NewToolDialog.
...
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 499100c5b66ec9c1fac49c9a068908499100c5b66ec9c1fac49c9a068908f48474fc829c9a068908f48474fc820ff9252024398f71471db11413b7f06b0c3820d8577c2b88ab
2012-11-12 14:22:02 -06:00
Lee Venable
fd08ca5acc
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
...
Former-commit-id: ca20167d7e72aedbceceab62adea95ca20167d7e72aedbceceab62adea957db247e33aab62adea957db247e33a9715b63d076ab3480255ded0bfb92f92063028bcb02aebcfad
2012-11-12 14:13:06 -06:00
Lee Venable
2769b8cfb8
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
...
Former-commit-id: 6359f32b18d9022d16a6879078484e6359f32b18d9022d16a6879078484e62c42850e8879078484e62c42850e865e61211782b1be166a24f26da9a9a0a39d42de119bf7ac8aa
2012-11-12 14:09:44 -06:00
Roger Ferrel
0815987920
Issue #1298 Changes for non-blocking NewTextProductDialog.
...
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 5ea786daafce6d6e277e3676829e8f5ea786daafce6d6e277e3676829e8fee323d9c603676829e8fee323d9c60fe965f064e88968c54e573d9e78e924f86b0b521d3eda170ed
2012-11-12 13:20:05 -06:00
Matt Nash
bd4226a7dd
Issue #1324 make times display in 24 hour time
...
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 0894e7800d7fa21f50411480e0abfc0894e7800d7fa21f50411480e0abfc0a2f7c9ed21480e0abfc0a2f7c9ed2ffa1d74e12dcda4b3fa4d728ffadd031241c2d944822f87139
2012-11-12 12:53:26 -06:00
Roger Ferrel
97ddd8da5b
Issue #1298 Changes for non-blocking GridInfoDialog.
...
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: dde8ce56c01f509c5a5430ef939e3cdde8ce56c01f509c5a5430ef939e3c438731ca2e30ef939e3c438731ca2e5e77bcf8bd8490814573195d876753df5b8485c6f5343fae99
2012-11-12 12:00:03 -06:00
Roger Ferrel
91e47f49aa
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
...
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: 259949bc5fb60cbeda7ad89ce26aeb259949bc5fb60cbeda7ad89ce26aebd489a7ef9fd89ce26aebd489a7ef9f2916b0a3b8ecba7301a1e01a4ae24326afb7f186e1bf6814d8
2012-11-12 07:14:15 -06:00
Lee Venable
3dd781dc0c
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
...
Former-commit-id: db5861e92a125ac804a7109076cb73db5861e92a125ac804a7109076cb73dac9544eed109076cb73dac9544eed449d8fe737ff21b8d604a267d9020b458133c1212542ec20ca
2012-11-08 17:06:54 -06:00
Nate Jensen
fd4deff58c
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
...
Former-commit-id: 78d49992a35e718ca85ba92bfa939378d49992a35e718ca85ba92bfa9393cdd6a986e8a92bfa9393cdd6a986e8974598ee1c38511f0e955e3c076506cbd03947daf3daf3dfbb
2012-11-08 14:50:17 -06:00
Dustin Johnson
63240a4ec5
Issue #1302 Restore jdom.jar, delete net.jcip/.project
...
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 19c2e301b8db4d728eb7595c421e4719c2e301b8db4d728eb7595c421e472b6e98954e595c421e472b6e98954e272761ae41eac5bc81970806be04dd1317e0b3eff9c6566ba7
2012-11-08 14:47:17 -06:00
Ben Steffensmeier
062505e855
Issue #1108 initial implementation of mappings
...
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: a0f6c320cb20e618eb4f535c73051da0f6c320cb20e618eb4f535c73051d693090cb36535c73051d693090cb360f58b01a587c93db759c884c82c4fe74d13811802223e6ff64
2012-11-08 14:45:36 -06:00
Roger Ferrel
4aeb7fd6d3
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
...
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: fb742c6dbf709798659de26b14a84dfb742c6dbf709798659de26b14a84d89617dda68e26b14a84d89617dda68ddeecc6e98553344fb3b05825bd6f3f13bedab32e3b4a7d750
2012-11-08 11:19:51 -06:00
Lee Venable
b24d461c8d
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
...
Former-commit-id: 72972d37b76c0bb76679be460c956e72972d37b76c0bb76679be460c956ee791e73a30be460c956ee791e73a3040c27a24031e61d4bd087b5f085643b3991fa4c92f390bd372
2012-11-08 11:11:15 -06:00
