Steve Harris
|
f0121b6fa8
|
Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
Former-commit-id: 8b7665418a [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 63da835aef
|
2012-10-16 09:20:37 -05:00 |
|
Lee Venable
|
ed1e6d6f57
|
Merge "Issue #1229 Changes for non-blocking PrintDialog." into development
Former-commit-id: e59ff7722a [formerly 143ba131d0] [formerly 552224976e [formerly 17b7e3bbae7230bfa40490b84b7b13cf41881649]]
Former-commit-id: 552224976e
Former-commit-id: 99faa86fe5
|
2012-10-15 16:45:52 -05:00 |
|
Steve Harris
|
725b2f8ba5
|
12.11.1-3 baseline
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
|
2012-10-15 16:30:31 -05:00 |
|
Roger Ferrel
|
bebf021d69
|
Issue #1229 Changes for non-blocking HelpUsageDlg.
Reviewer comments.
Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea
Former-commit-id: bd22b5b4f1 [formerly cc3c4f311f] [formerly dc6fa3cfd0 [formerly e6ad4922c4bc950fcf9cb184707b3e757373e851]]
Former-commit-id: dc6fa3cfd0
Former-commit-id: b37bea29ba
|
2012-10-15 15:58:30 -05:00 |
|
Roger Ferrel
|
c1bc223001
|
Issue #1229 Changes for non-blocking PrintDialog.
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b
Former-commit-id: 8533066287 [formerly b27323c29e] [formerly 059c8a4d7c [formerly c748615380d65d7a105ffd2e46cf1eba3cb035b9]]
Former-commit-id: 059c8a4d7c
Former-commit-id: a664fc8b8b
|
2012-10-15 15:24:04 -05:00 |
|
Roger Ferrel
|
91e307e265
|
Issue #1229 Changes for non-blockig TextEditorSetupDlg.
Change-Id: Ia63762fbba6c89a60302d56158f846e3cc3e53cc
Former-commit-id: 329db1fa5a [formerly 5b967cd04d] [formerly ba6ff53d4d [formerly 022d0f76b455d6136ee88572bf95cafc1f35863b]]
Former-commit-id: ba6ff53d4d
Former-commit-id: 3f45b19774
|
2012-10-15 09:05:16 -05:00 |
|
Lee Venable
|
e44f243654
|
Merge changes I46412605,If726affd into development
* changes:
Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
Issue #1229 changes for non-blocking MonitoringCriteriaDlg, TafProductConfigDlg and TafSiteInfoEditorDlg.
Former-commit-id: c4d301c955 [formerly 5fd8873145] [formerly 5a296b682c [formerly ee68220587fcd4ea191fc9d269a7f01ee17f538e]]
Former-commit-id: 5a296b682c
Former-commit-id: 9d847ee437
|
2012-10-15 08:59:39 -05:00 |
|
Nate Jensen
|
93143bbda0
|
Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae
Former-commit-id: cbc2da0c06 [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
|
2012-10-12 15:16:27 -05:00 |
|
Roger Ferrel
|
8b31eb04ab
|
Issue #1229 Refactored OpenSaveDlg to OpenDlg and made non-blocking.
Change-Id: I4641260558b289bf7b29462032015b38ff6219a3
Former-commit-id: 45918c826f [formerly 82637bea2a] [formerly ceabf8446e [formerly 2131624d82de6ae90929be45b4a706080b889699]]
Former-commit-id: ceabf8446e
Former-commit-id: 72df39c19b
|
2012-10-12 15:04:17 -05:00 |
|
Roger Ferrel
|
62b6f1cf38
|
Issue #1229 changes for non-blocking MonitoringCriteriaDlg, TafProductConfigDlg and TafSiteInfoEditorDlg.
Change-Id: If726affda56d435cc15506dcd3a5439f7f476e35
Former-commit-id: f76e6d3eae [formerly efb13c2b94] [formerly 42c7ef3ef6 [formerly 9e039290f43cff3faae208a39286c99e83978e17]]
Former-commit-id: 42c7ef3ef6
Former-commit-id: 901fc10336
|
2012-10-12 14:13:18 -05:00 |
|
Nate Jensen
|
30c6faf44f
|
Merge "Issue #1229 Changes for non-blocking MessageViewerDlg. Reviewer comment corrections." into development
Former-commit-id: 9aaeea3337 [formerly 2fe7afd8d7] [formerly dd7f1fe5f1 [formerly 55a7f25e74ab71a83053b54a8214e949516058ea]]
Former-commit-id: dd7f1fe5f1
Former-commit-id: 227fc6259e
|
2012-10-12 12:57:23 -05:00 |
|
James Korman
|
883a2780cf
|
Issue #1229 - Removed dialog no longer needed.
Change-Id: Ib5330088f94932c4d8797b89eaf42bb62b57ab4d
Former-commit-id: 6b6d9f4e39 [formerly 9b244417a8] [formerly b995faf77a [formerly 985db9c6aa1d3339647a3be12ee776d3f90993ae]]
Former-commit-id: b995faf77a
Former-commit-id: 1ca63e7520
|
2012-10-12 11:50:49 -05:00 |
|
Ron Anderson
|
c82da89068
|
Merge "Issue #1091 Fixed combination file generation." into development
Former-commit-id: 7640b281fa [formerly 5064bd8734] [formerly 678110fd31 [formerly f9431f2bd771225cac164a0d7ecf04166844d213]]
Former-commit-id: 678110fd31
Former-commit-id: 6ab5f4d00c
|
2012-10-12 11:44:28 -05:00 |
|
Roger Ferrel
|
bf038b25c4
|
Issue #1229 FindReplaceDlg II fixes to work with hidable TafViewerEdtiorDlg.
Change-Id: Id865a77ccb0c376f303d4f5a2c718a4ba33fd94a
Former-commit-id: b49ca90d6c [formerly 3b6823a45c] [formerly 34ef8d5a47 [formerly 8120a2f6e4cf96e5d11a24a5cfddbe709798eecc]]
Former-commit-id: 34ef8d5a47
Former-commit-id: e2382e026e
|
2012-10-12 11:03:08 -05:00 |
|
Ron Anderson
|
488d357413
|
Issue #1091 Fixed combination file generation.
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2
Former-commit-id: c264f72a53 [formerly 4ca413a222] [formerly 510cabe655 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]
Former-commit-id: 510cabe655
Former-commit-id: e0fc2a36c6
|
2012-10-12 10:32:36 -05:00 |
|
Roger Ferrel
|
f86ef0dec3
|
Issue #1229 Changes for non-blocking FindReplaceDlg.
Change-Id: I9bb97051cb15f84fde8540056a78f29420d2c665
Former-commit-id: eacd9d817c [formerly 03b8991ec0] [formerly bfbca13dc9 [formerly 91a283a721f55dfe00f9bd0d2f57def122eb6be4]]
Former-commit-id: bfbca13dc9
Former-commit-id: 71b1beece8
|
2012-10-12 09:43:52 -05:00 |
|
Roger Ferrel
|
d14610bf35
|
Issue #1229 Changes for non-blocking MessageViewerDlg.
Reviewer comment corrections.
Change-Id: I5e7b6969a9d426fbd8b5f320dbd6914c23d0fcd0
Former-commit-id: 8fffc0ba1e [formerly 1849ac40d5] [formerly 38ad9ea5bb [formerly 5cbd3685e7a612394fd6b0e1315656727f320726]]
Former-commit-id: 38ad9ea5bb
Former-commit-id: 415d85cd54
|
2012-10-12 09:14:37 -05:00 |
|
Roger Ferrel
|
ef7a896a78
|
Issue #1229 Changes to make non-blocking TafViewerEditorDlg.
Change-Id: Ib68b4fcca708d75d86642ae49be2506df9d20e62
Former-commit-id: fabce96eed [formerly 1c2981ebbe] [formerly b6e20b0d46 [formerly 9929ff90e05c98410e26e538ce47ff642407a77b]]
Former-commit-id: b6e20b0d46
Former-commit-id: 094200fc1a
|
2012-10-12 07:21:28 -05:00 |
|
James Korman
|
bd0d2ce10d
|
Issue #1229 - Change to use non-blocking
Change-Id: I98d8549345ea4450342c17f23649cd14c29f666d
Former-commit-id: f6018e03d1 [formerly f4a7a5c2d5] [formerly 2fefd0c8a2 [formerly 982bf7b1bd34b93c227b722deb41f516d8b51e82]]
Former-commit-id: 2fefd0c8a2
Former-commit-id: 3641b1fe46
|
2012-10-11 15:09:30 -05:00 |
|
James Korman
|
502510ff48
|
Issue #1229 - Issue #1229 - Change to use non-blocking.
Change-Id: I2da0ebd176f7f50d63d70aed28bfe3385ac39a48
Former-commit-id: 0bffd25bdc [formerly 7769d4cc14] [formerly 860bd4af04 [formerly ae8a0dcce3055931c901093e148639f959c70a97]]
Former-commit-id: 860bd4af04
Former-commit-id: 3be1610080
|
2012-10-11 11:31:43 -05:00 |
|
Nate Jensen
|
4ac301ad02
|
Merge "Issue #1229 Changes for non-blocking TimeSelectorDialog." into development
Former-commit-id: 15da1de9a4 [formerly a2c665644d] [formerly f224d8df27 [formerly 8fad036c514ec9c55e38888ce9013c983665fb8a]]
Former-commit-id: f224d8df27
Former-commit-id: 2415539d60
|
2012-10-11 11:18:14 -05:00 |
|
James Korman
|
26e22665c2
|
Issue #1229 - Change to use non-blocking.
Change-Id: I9989b5b37e39a553434d4c104bfe9577925a6bd7
Former-commit-id: 7569aac1ea [formerly d256be6980] [formerly cdbf9085f5 [formerly b68db18e4d20db986844bf3fdb44d74f31308539]]
Former-commit-id: cdbf9085f5
Former-commit-id: 12ba9d630f
|
2012-10-11 10:02:53 -05:00 |
|
Roger Ferrel
|
c3c445b2e2
|
Issue #1229 Changes for non-blocking TransmissionQueueDlg.
Change-Id: Iec8ffefbde98e0e86433592562a0f0f15b0c8a86
Former-commit-id: 295a3ab808 [formerly d734ffe25a] [formerly 3f942e3fb3 [formerly 1b1b5a0f1c3966524c3e634bf53502d08c3fb80d]]
Former-commit-id: 3f942e3fb3
Former-commit-id: 6f8ffc346f
|
2012-10-10 16:30:59 -05:00 |
|
Nate Jensen
|
5ee3ef5772
|
Merge "Issue #1229 Chagnes for non-blocking TransmissionViewerDlg." into development
Former-commit-id: da243b4eaf [formerly e2f314bf5d] [formerly 15c49c9d28 [formerly 8b2095a8ff67f207b93fd2c7650efc42de76d56e]]
Former-commit-id: 15c49c9d28
Former-commit-id: b120e91cce
|
2012-10-10 16:20:56 -05:00 |
|
Nate Jensen
|
55e59df001
|
Merge "Issue #1229 Changes for non-blocking /SendDialog." into development
Former-commit-id: c2d63ba74a [formerly 7c76c9e169] [formerly 469a155107 [formerly 0f10e8442ad8cef0cb13e68aec158f8a6bb3d23e]]
Former-commit-id: 469a155107
Former-commit-id: 38d4ac0f89
|
2012-10-10 15:35:30 -05:00 |
|
Roger Ferrel
|
cbf43b3de9
|
Issue #1229 Chagnes for non-blocking TransmissionViewerDlg.
Change-Id: I6f274a5add6bdf4c5d74109df7fdeed6ac31d879
Former-commit-id: 9177814726 [formerly 85024ea361] [formerly e0a9838019 [formerly fb76068864dc1d5d528fa6ff793cc7aff7eef95e]]
Former-commit-id: e0a9838019
Former-commit-id: c0c56c61bd
|
2012-10-10 14:30:39 -05:00 |
|
Roger Ferrel
|
3e638f6622
|
Issue #1229 Changes for non-blocking TimeSelectorDialog.
Change-Id: I4826e62fe68fb128b8d146f6d386101adc758a37
Former-commit-id: 6098efb4a1 [formerly 624f6bfd01] [formerly 53d6dde72f [formerly fcca46a4698610dd8a3124ab7e23a3b88913cd6a]]
Former-commit-id: 53d6dde72f
Former-commit-id: b5ada2917e
|
2012-10-10 13:17:29 -05:00 |
|
Roger Ferrel
|
713f85c33d
|
Issue #1229 Changes for non-blocking ResourceEditorDlg.
Change-Id: I2cc2bb30efd3236ec1c207e72f59352d6a266764
Former-commit-id: 4208dafcfa [formerly e49a28b546] [formerly 5a3b0339b9 [formerly 50739bb740c150b10c3cbde3581fe57fbd48295e]]
Former-commit-id: 5a3b0339b9
Former-commit-id: f699a83fec
|
2012-10-10 09:47:44 -05:00 |
|
Nate Jensen
|
fa3214a139
|
Merge "Issue #1248 Changes to allow change listeners on Alter Bundles. Changes from code review 2." into development
Former-commit-id: f4176e5d29 [formerly 47d9a92acf] [formerly a53dab0bce [formerly 2ee8a3a7bede3ed5237ddbe4277b18645ff6089f]]
Former-commit-id: a53dab0bce
Former-commit-id: 961154e231
|
2012-10-10 09:42:54 -05:00 |
|
Roger Ferrel
|
3593e9fb79
|
Issue #1229 Changes for non-blocking CigVisTrendDlg and removal of CigVisTrendAction.
Resolve merge conflict issues.
Change-Id: I67e1860e7f2b3f355b28969d726bc938098fc615
Former-commit-id: 5a38574cdd [formerly 04efdb3275] [formerly 2fbfdea81c [formerly 9374fe790f4fe40849cb8e94cbf61347ed372226]]
Former-commit-id: 2fbfdea81c
Former-commit-id: 1ab8dfe6ec
|
2012-10-10 09:22:47 -05:00 |
|
Nate Jensen
|
f9557eaec1
|
Merge "Issue #1229 Changes for non-blocking TafMonitorDlg. Reviewer comment changes." into development
Former-commit-id: 62f0eb68c9 [formerly f5f6d1e1ed] [formerly 608be7d721 [formerly 6f8580a6ccf44f9274a595fb0bce7562a5c4ca16]]
Former-commit-id: 608be7d721
Former-commit-id: d9a2c114f3
|
2012-10-10 09:00:52 -05:00 |
|
Roger Ferrel
|
09bb914dc0
|
Issue #1248 Changes to allow change listeners on Alter Bundles.
Changes from code review 2.
Change-Id: I8f8640a9c90c0191179c74570855a67370617a20
Former-commit-id: 65a19e48b0 [formerly e7d27f4aab] [formerly 03070aded9 [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]
Former-commit-id: 03070aded9
Former-commit-id: f4861554cd
|
2012-10-10 06:52:09 -05:00 |
|
Roger Ferrel
|
9656e2eb09
|
Issue #1229 Changes for non-blocking TafMonitorDlg.
Reviewer comment changes.
Change-Id: I54540db43041a837281e6abc3680ed8a22c38fce
Former-commit-id: b6ec22777b [formerly 423099eb56] [formerly 0f1a6455f8 [formerly c684feebc7c80dc7b2f0e23c95dbab6efcc2f797]]
Former-commit-id: 0f1a6455f8
Former-commit-id: a915dda620
|
2012-10-09 16:42:32 -05:00 |
|
Max Schenkelberg
|
4a31ef0550
|
Issue #1254 fixed PointsToolLayer to clear map of fonts after disposing
Change-Id: I00729cc0fd8f5494fe887c5fc7a52322a42f79d7
Former-commit-id: 7331714179 [formerly 7252e368b2] [formerly 2fde80c042 [formerly 28aa96f0fabb707cc997047dd070f7d7d18630c7]]
Former-commit-id: 2fde80c042
Former-commit-id: b6c2c53dff
|
2012-10-09 15:03:20 -05:00 |
|
Roger Ferrel
|
bfa3fbad2a
|
Issue #1229 Changes for non-blocking /SendDialog.
Change-Id: Ic159abe9d8808cea581b86025e93f3b224f1a3c0
Former-commit-id: 25a917670e [formerly af2e69fbc2] [formerly 5318729ac9 [formerly c860253fd22c4e1ce8ac792a62b55d39c70392ba]]
Former-commit-id: 5318729ac9
Former-commit-id: b76e2fc386
|
2012-10-09 13:58:03 -05:00 |
|
Lee Venable
|
0c029d78d2
|
Merge "Issue #1229 Changes for non-blocking QcDialog and removal of RestoreFileSelectDlg." into development
Former-commit-id: 636789f2c7 [formerly 5ff0a48870] [formerly cb93e7cf7f [formerly 10ddff4f3d378b4bac6451aead120eb4e2be2415]]
Former-commit-id: cb93e7cf7f
Former-commit-id: 04da28e5d6
|
2012-10-09 12:50:04 -05:00 |
|
Roger Ferrel
|
741bad13ce
|
Issue #1229 Changes for non-blocking QcDialog and removal of RestoreFileSelectDlg.
Change-Id: I6a85b553341ddc121f189714b8c36aa5f66ae93d
Former-commit-id: 85936950ef [formerly 17f92f7aa2] [formerly 0bd4507303 [formerly 50514227a648be22e689a539428ffbe044c0bf45]]
Former-commit-id: 0bd4507303
Former-commit-id: 9f2bcd731b
|
2012-10-09 11:00:17 -05:00 |
|
Roger Ferrel
|
6967637e66
|
Issue #1229 Chagnes for non-blocking MetarDisplayDialog and removal of MetarAction.
Change-Id: Ie2d8c762fa704b5c2562f9bc90ada00d3e0e4ca2
Former-commit-id: ef80636602 [formerly 39624d1c5f] [formerly 7f456dc599 [formerly 53bfe4991330812aa8e5853967d1ec1f1a86a490]]
Former-commit-id: 7f456dc599
Former-commit-id: ee843cea5b
|
2012-10-09 10:15:32 -05:00 |
|
Nate Jensen
|
c197a834d3
|
Merge "Issue #1248 Added PointChangeListener to BaseadarProductUI." into development
Former-commit-id: 6138594c28 [formerly 368974d799] [formerly 23b9af5837 [formerly 46afcdc87bfddfc3b1a8b2cf6f43cd5931e64c7b]]
Former-commit-id: 23b9af5837
Former-commit-id: e93273e828
|
2012-10-09 09:57:11 -05:00 |
|
Roger Ferrel
|
7c480639d7
|
Issue #1229 Changes for non-blocking WindRosePlotDlg and removal of dead classes WindRoseAction and CigVisDistAction.
Code review commemts.
Change-Id: Ibdea77e3420b0f47a29a01a65f1d945c704be051
Former-commit-id: 4836635569 [formerly 58af492aac] [formerly 96fc347d71 [formerly 28df53c27dc13fd25e2629bcf0afaf0afe98e6be]]
Former-commit-id: 96fc347d71
Former-commit-id: 6b1d04d281
|
2012-10-09 07:03:03 -05:00 |
|
Roger Ferrel
|
25be78547f
|
Issue #1229 Changes to make CigVisDistributionDlg non-blocking.
Change-Id: Ibe86a52bb580c358f72d0840027ec9e0b85e97a9
Former-commit-id: 852c1d67a5 [formerly 510ca367bd] [formerly 6ec7a84979 [formerly 895cbec5bbbe3f78baa73d9bad9d462d6b9bf35b]]
Former-commit-id: 6ec7a84979
Former-commit-id: e2bfb04612
|
2012-10-08 15:52:54 -05:00 |
|
Ron Anderson
|
453b7c9a04
|
Issue #1239 Fixed 64-bit Cave crash
Change-Id: I83d729b1f463b2043b1186615751dde047e5e824
Former-commit-id: ebdfe3816e [formerly ad1d532459] [formerly e0236dc5c9 [formerly 6b835a2d9f92d8bc4fc76e883ba4fb84256e185b]]
Former-commit-id: e0236dc5c9
Former-commit-id: 71351d7247
|
2012-10-08 15:01:44 -05:00 |
|
Roger Ferrel
|
f695425f85
|
Issue #1248 Added PointChangeListener to BaseadarProductUI.
Change-Id: Idf56e60d8544f0f5dc3c3aed7d8a46f10f397f18
Former-commit-id: 20ba59e8f2 [formerly 3ae3a55292] [formerly f3acb4798d [formerly 3f883c0cdad8e9219c10e83cacf1a5ca0000d25d]]
Former-commit-id: f3acb4798d
Former-commit-id: 6a2ad5c59a
|
2012-10-08 14:08:00 -05:00 |
|
Roger Ferrel
|
bc5b448eb2
|
Issue #1229 Convert AvnconfigDlg to sub-class of CaveSWTDialog and make non-blocking.
Change-Id: Ia2ac142c4fc79c04b1099473a2dbe25160611a8c
Former-commit-id: 6d3e649350 [formerly bd0a67b11d] [formerly 12870b713a [formerly a7506f88d1bd54226c4e9372fc13876cc07a5362]]
Former-commit-id: 12870b713a
Former-commit-id: fc8015c606
|
2012-10-08 13:52:18 -05:00 |
|
Steve Harris
|
ce257024b7
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 845ec1aa8b [formerly a19d76eca8] [formerly 17e36a68b1 [formerly 83a37094859e60605f333c18ae4dc4cb72200c64]]
Former-commit-id: 17e36a68b1
Former-commit-id: b6ba0523a6
|
2012-10-08 13:49:35 -05:00 |
|
Steve Harris
|
48a80a23e4
|
Merge branch 'ss_builds' (12.11.1-2) into development
Change-Id: I4d3416f5f91d7955dd8eb274cd536563862e2b73
Former-commit-id: 7be572b27d [formerly 8c97afe03b] [formerly 0895f22690 [formerly 1a255600a5e909dc4189e9c88d0735157a400a1d]]
Former-commit-id: 0895f22690
Former-commit-id: 8dae024430
|
2012-10-08 13:29:34 -05:00 |
|
Steve Harris
|
772c60efa4
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
|
2012-10-08 13:26:20 -05:00 |
|
Lee Venable
|
150f29602d
|
Merge "Issue #1229 Changes for non-blocking NCDCInvHistDlg" into development
Former-commit-id: 749e5bb3f7 [formerly bb95f024cb] [formerly ed3ea856d2 [formerly 30b0ffaa2c90ede16e27390a4b58218c5085ae54]]
Former-commit-id: ed3ea856d2
Former-commit-id: be5c239912
|
2012-10-08 13:11:38 -05:00 |
|
Lee Venable
|
b4270078ca
|
Merge "Issue #1229 Made AviationDialog blocking when stand along." into development
Former-commit-id: 31153efb84 [formerly ee179ab5ce] [formerly a3e53c21f6 [formerly 7187662a29a2b3b69e113113a1c7a5f95cdaecd3]]
Former-commit-id: a3e53c21f6
Former-commit-id: 272c84b56b
|
2012-10-08 13:05:49 -05:00 |
|
Nate Jensen
|
61ad5fbf6a
|
Merge "Issue #1151 move alert parsing into the resource data so that it can clear the time cache for derived alerts. Change-Id: Iba5b641fbd6e8fa3657a7dd2311ae18cf63456f8" into development
Former-commit-id: 11927a63c1 [formerly 33ab350a1c] [formerly aaf6cccc81 [formerly d5299f9c4715619d9abfe06d9c3280570cabe391]]
Former-commit-id: aaf6cccc81
Former-commit-id: 9830e61f46
|
2012-10-08 13:01:45 -05:00 |
|