xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43012 commits 31 branches 40 tags 3.8 GiB
Commit graph

78 commits

Author SHA1 Message Date
mjames-upc
4373760eaf further with the menus 2016-05-02 18:22:14 -05:00
mjames-upc
5e6a40e37c various D2D menu updates 2016-04-30 17:37:50 -05:00
mjames-upc
e2d9ba9a4c merge unidata_15.1.1 to unidata_16.1.4 
Former-commit-id: 0dc3df68aa76348b27e8ce208cb72d91467184c0
 2016-03-25 13:09:32 -05:00
mjames-upc
3a59fefb09 cleaning up unidata_15.1.1 enough to launch in eclipse 
Former-commit-id: 0b01029e68
 2015-12-29 20:15:31 -07:00
mjames-upc
194adffea5 another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n 
Former-commit-id: f25e918e50
Former-commit-id: c921ec69d6
 2015-09-03 15:48:53 -06:00
Steve Harris
55b82a66ff Merge branch 'omaha_sails_15.1.1' into omaha_16.1.1 
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/GridLightningResource.java


Former-commit-id: b66814c4efc93113c131298b904f02675cda88ea
 2015-07-13 18:39:29 -05:00
Nate Jensen
a6fb4146a0 Merge "Omaha #4595 fixed total lightning resource ordering" into omaha_15.1.1 
Former-commit-id: 4d3138ac1f4df02cb372722a7b6b57c41dd7bcc9
 2015-07-01 14:26:29 -05:00
Brian Clements
588b2d83f4 Omaha #4596 changed total lightning menu names to ENI Total Lightning 
Change-Id: Ia8c1f740d28d2cf063eb14132b3c403e6fa174de

Former-commit-id: 59c5fc0d7e49dfc4fe27435ef0664d90d78c4826
 2015-07-01 13:11:29 -05:00
Brian Clements
107d672250 Omaha #4595 fixed total lightning resource ordering 
Change-Id: I27928e04c9f809c1519d972e7161e852b74f86d6

Former-commit-id: 9fe972d808d520e42772f8dc9207a930f8f98111
 2015-07-01 12:48:20 -05:00
Brian Clements
489ee6c0c3 Omaha #4594 added 1-min plot menu items for total lightning 
Change-Id: I85dc8d484183c378cac1bc54a33160cf7b9104dc

Former-commit-id: 392356843cccb2c88ae616e1c2e5035e42c72845
 2015-07-01 10:38:45 -05:00
AWIPS User
2d4e9525a9 sat menu changes. nws POES items muted 
Former-commit-id: e75187a1d4 [formerly 015d8a8547] [formerly 8953e0d543] [formerly 2dee357b7fc5fc866dfa14ff7851b3d2ec6d03c7 [formerly 22e82a5b033c5197843554bbe55331692f74609a] [formerly 8953e0d543 [formerly 8883d56fea]]]
Former-commit-id: bdbca8461602b4fe331fe5ca95c8f2d6a3598c43 [formerly 6952bb47e223961dff4b184dd9fde046ea5e25ef] [formerly 97fc0d0f5f [formerly 2b49132cbc]]
Former-commit-id: e80e973fcfc2254a489faf3b6109b8524de2bb1d [formerly 97fc0d0f5f]
Former-commit-id: 763ae44868
 2015-06-23 16:20:13 -06:00
AWIPS User
2b410fa4cb USPLN support added to binlightning plugin 
Former-commit-id: 99bed9bee8 [formerly 1d894e9c65] [formerly d4634d3d23] [formerly 67d49142371a2abf5bfd518a03e634009d73038e [formerly 7148e21bf7ede4a8359964cea33acba6ca416d65] [formerly d4634d3d23 [formerly cc4a291081]]]
Former-commit-id: b29ea42696c57b110405a05da2d85cec40b70c91 [formerly ac894c4081b3271165c795fd6ea14f0aa1b2399f] [formerly ce7c0f2814 [formerly 4131ba0cd1]]
Former-commit-id: ce7c0f2814
Former-commit-id: 6d35b862e6
 2015-06-22 19:05:53 -06:00
Ben Steffensmeier
6c2d341080 Omaha #4284 Create better id for obs/lightning menu. 
Former-commit-id: 31893413de438660784ee82274e23f361abb0c1c
 2015-05-07 10:53:46 -05:00
Fay.Liang
1c80edbed0 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: ec7875e9a4bec3752aeb8442fca15e4e4fd02571
 2015-03-18 15:08:01 -04:00
Fay.Liang
fd502062c5 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 1c80edbed0 [formerly ec7875e9a4bec3752aeb8442fca15e4e4fd02571]
Former-commit-id: 3b9e0864ab
 2015-03-18 15:08:01 -04:00
Fay.Liang
a10c5cfb94 Merge branch 'field_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1 
Former-commit-id: 1c80edbed0 [formerly fd502062c5 [formerly 3b9e0864ab] [formerly 1c80edbed0 [formerly ec7875e9a4bec3752aeb8442fca15e4e4fd02571]]]
Former-commit-id: fd502062c5 [formerly 3b9e0864ab]
Former-commit-id: fd502062c5
Former-commit-id: 9b9a3bb1eb
 2015-03-18 15:08:01 -04:00
Jason Burks
3d3f3a6535 VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926 
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992
 2015-03-14 14:36:37 +00:00
Jason Burks
e1e7f27857 VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926 
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 3d3f3a6535 [formerly 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992]
Former-commit-id: dc59270db2
 2015-03-14 14:36:37 +00:00
Jason Burks
b970916a0e VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926 
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 3d3f3a6535 [formerly e1e7f27857 [formerly dc59270db2] [formerly 3d3f3a6535 [formerly 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992]]]
Former-commit-id: e1e7f27857 [formerly dc59270db2]
Former-commit-id: e1e7f27857
Former-commit-id: 11e66fcd1f
 2015-03-14 14:36:37 +00:00
Ben Steffensmeier
989acdf74b Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus. 
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 0e31a9da60cfa9d99a8aae21f3bf2f403b838312
 2015-03-05 16:20:44 -06:00
Ben Steffensmeier
b47c266ed0 Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus. 
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 989acdf74b [formerly 0e31a9da60cfa9d99a8aae21f3bf2f403b838312]
Former-commit-id: 3ec9b5dac6
 2015-03-05 16:20:44 -06:00
Ben Steffensmeier
4c1676a2fa Omaha #4233 Remove cloud flash and pulse menu items from GLD and NLDN menus. 
Change-Id: I73f67925b0f14fd1eb062ea8f157dc7487f0b030

Former-commit-id: 989acdf74b [formerly b47c266ed0 [formerly 3ec9b5dac6] [formerly 989acdf74b [formerly 0e31a9da60cfa9d99a8aae21f3bf2f403b838312]]]
Former-commit-id: b47c266ed0 [formerly 3ec9b5dac6]
Former-commit-id: b47c266ed0
Former-commit-id: c440725187
 2015-03-05 16:20:44 -06:00
Brian Clements
ac0db6291b Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time 
Change-Id: I413bb4ff91aa3ad0c56d386c8466400afbf58204

Former-commit-id: 662bd201dba808edcce74aeafa1257a157e6b6ea
 2014-07-28 12:51:07 -05:00
Brian Clements
48c7c979c0 Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time 
Change-Id: I413bb4ff91aa3ad0c56d386c8466400afbf58204

Former-commit-id: ac0db6291b [formerly 662bd201dba808edcce74aeafa1257a157e6b6ea]
Former-commit-id: eedea4e6ce
 2014-07-28 12:51:07 -05:00
Brian Clements
5144f6e3e8 Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time 
Change-Id: I413bb4ff91aa3ad0c56d386c8466400afbf58204

Former-commit-id: ac0db6291b [formerly 48c7c979c0 [formerly eedea4e6ce] [formerly ac0db6291b [formerly 662bd201dba808edcce74aeafa1257a157e6b6ea]]]
Former-commit-id: 48c7c979c0 [formerly eedea4e6ce]
Former-commit-id: 48c7c979c0
Former-commit-id: 8667192f2e
 2014-07-28 12:51:07 -05:00
Brian Clements
593207f46a Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time 
Change-Id: I413bb4ff91aa3ad0c56d386c8466400afbf58204

Former-commit-id: 5144f6e3e8 [formerly 8667192f2e] [formerly 48c7c979c0] [formerly 48c7c979c0 [formerly eedea4e6ce]] [formerly 5144f6e3e8 [formerly 8667192f2e] [formerly 48c7c979c0] [formerly 48c7c979c0 [formerly eedea4e6ce]] [formerly ac0db6291b [formerly 48c7c979c0 [formerly eedea4e6ce] [formerly ac0db6291b [formerly 662bd201dba808edcce74aeafa1257a157e6b6ea]]]]]
Former-commit-id: ac0db6291b
Former-commit-id: 5b27b3aa13 [formerly 8b6e09dfd1] [formerly 54c473dba5] [formerly e5af895cc8a436940cfa2151f2a004faca1726c2 [formerly 4063802c36f6371a0fef3dce688e2507a30a554b] [formerly 54c473dba5 [formerly 40dd09de1c]]]
Former-commit-id: df7cfa8239bd7fcf7947a498f60e5e7b5f346016 [formerly 8a34d0325a781aced44cd603043aa29230a3a5a5] [formerly 54be6548ba [formerly 5c3d7b1d51]]
Former-commit-id: 54be6548ba
Former-commit-id: a1538d7b4b
 2014-07-28 12:51:07 -05:00
Brian Clements
e5a63e5cf5 Omaha #3333 grid lightning image by default, log style rule 
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32

Former-commit-id: 127cdbea94ed37f0a2c3ddf113df8f093549d077
 2014-07-24 13:34:43 -05:00
Brian Clements
e018ec56dd Omaha #3333 grid lightning image by default, log style rule 
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32

Former-commit-id: e5a63e5cf5 [formerly 127cdbea94ed37f0a2c3ddf113df8f093549d077]
Former-commit-id: a6b414bd1f
 2014-07-24 13:34:43 -05:00
Brian Clements
010044c071 Omaha #3333 grid lightning image by default, log style rule 
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32

Former-commit-id: e5a63e5cf5 [formerly e018ec56dd [formerly a6b414bd1f] [formerly e5a63e5cf5 [formerly 127cdbea94ed37f0a2c3ddf113df8f093549d077]]]
Former-commit-id: e018ec56dd [formerly a6b414bd1f]
Former-commit-id: e018ec56dd
Former-commit-id: 3c73726be1
 2014-07-24 13:34:43 -05:00
Brian Clements
2195a6a7bb Omaha #3333 grid lightning image by default, log style rule 
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32

Former-commit-id: 010044c071 [formerly 3c73726be1] [formerly e018ec56dd] [formerly e018ec56dd [formerly a6b414bd1f]] [formerly 010044c071 [formerly 3c73726be1] [formerly e018ec56dd] [formerly e018ec56dd [formerly a6b414bd1f]] [formerly e5a63e5cf5 [formerly e018ec56dd [formerly a6b414bd1f] [formerly e5a63e5cf5 [formerly 127cdbea94ed37f0a2c3ddf113df8f093549d077]]]]]
Former-commit-id: e5a63e5cf5
Former-commit-id: b93f015271 [formerly a3d3b2ee0f] [formerly 40c4f63196] [formerly f8fa2fc6e717e801a88f9394ddad4bc41acb4b68 [formerly d237d9418aad4f0bf2080aaad689b0fa7013e5fc] [formerly 40c4f63196 [formerly 8ecbbdebc1]]]
Former-commit-id: 5b244ced55bb7225d1ad1daafee00d8bf719bf24 [formerly 308be53fdeadea78c28d05b488088a31bada7c44] [formerly 69542586af [formerly 02d41cb45c]]
Former-commit-id: 69542586af
Former-commit-id: bc4483d8ca
 2014-07-24 13:34:43 -05:00
Brian Clements
29fc7e7ec4 Omaha #3333 added grid lightning to cave 
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 33736a713a2c360e70f5a06972a7a21937f2b34c
 2014-07-11 12:18:05 -05:00
Brian Clements
555251982b Omaha #3333 added grid lightning to cave 
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 29fc7e7ec4 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]
Former-commit-id: a50f1e8e70
 2014-07-11 12:18:05 -05:00
Brian Clements
534b838c95 Omaha #3333 added grid lightning to cave 
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 29fc7e7ec4 [formerly 555251982b [formerly a50f1e8e70] [formerly 29fc7e7ec4 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]
Former-commit-id: 555251982b [formerly a50f1e8e70]
Former-commit-id: 555251982b
Former-commit-id: f969720868
 2014-07-11 12:18:05 -05:00
Brian Clements
ba29c86016 Omaha #3333 added grid lightning to cave 
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 534b838c95 [formerly f969720868] [formerly 555251982b] [formerly 555251982b [formerly a50f1e8e70]] [formerly 534b838c95 [formerly f969720868] [formerly 555251982b] [formerly 555251982b [formerly a50f1e8e70]] [formerly 29fc7e7ec4 [formerly 555251982b [formerly a50f1e8e70] [formerly 29fc7e7ec4 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]]]]
Former-commit-id: 29fc7e7ec4
Former-commit-id: 0331bbc244 [formerly 8fdcc3183e] [formerly 140a4a4b15] [formerly 794b8b95b973523e9a00425dfb625ca805a1d93f [formerly e03addef9feeace5539e9b0f6c1a99cbfdc19c03] [formerly 140a4a4b15 [formerly e25961a39a]]]
Former-commit-id: 190e32f90607526bb79762fe218d9c4145865802 [formerly cd59138399b217c27c21822a756b68d7bb389f6a] [formerly b384c87dff [formerly db47c98989]]
Former-commit-id: b384c87dff
Former-commit-id: 47bb7f609e
 2014-07-11 12:18:05 -05:00
Brian Clements
a18069809a Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: 136bb5feca753f83f53d9d1e9381061853edc402
 2014-06-19 12:50:56 -05:00
Brian Clements
6345119f9b Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]
Former-commit-id: 7dd90e6f85
 2014-06-19 12:50:56 -05:00
Brian Clements
0a6bc2631f Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: a18069809a [formerly 6345119f9b [formerly 7dd90e6f85] [formerly a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]
Former-commit-id: 6345119f9b [formerly 7dd90e6f85]
Former-commit-id: 6345119f9b
Former-commit-id: 24e406cbf2
 2014-06-19 12:50:56 -05:00
Brian Clements
f315c4a1e6 Omaha #3214 added pulse and cloud flash rendering to cave 
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: 0a6bc2631f [formerly 24e406cbf2] [formerly 6345119f9b] [formerly 6345119f9b [formerly 7dd90e6f85]] [formerly 0a6bc2631f [formerly 24e406cbf2] [formerly 6345119f9b] [formerly 6345119f9b [formerly 7dd90e6f85]] [formerly a18069809a [formerly 6345119f9b [formerly 7dd90e6f85] [formerly a18069809a [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]]]]
Former-commit-id: a18069809a
Former-commit-id: 2843f6ed61 [formerly fa919b9d2d] [formerly bd2288e066] [formerly b885bfc8bd9d169c8ed4a0617728f9ce8c9cdd54 [formerly 150445682f7d66379f3836756c6b255b6676574a] [formerly bd2288e066 [formerly 6d5cbf29a5]]]
Former-commit-id: 39e887fb98022cb971a4368bc521c7ae56b0aa61 [formerly 779b58b592bf4d7a21c61fa23bb33f937bcf3653] [formerly cadb1091fb [formerly 74d4ebf071]]
Former-commit-id: cadb1091fb
Former-commit-id: fe445262e9
 2014-06-19 12:50:56 -05:00
Brian Clements
f39896b2d1 Omaha #3226 added total lightning decoder 
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: e2583481a77d08249030838ebd52eed6e54b2986
 2014-06-06 14:39:57 -05:00
Brian Clements
2e445986e2 Omaha #3226 added total lightning decoder 
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]
Former-commit-id: c278000764
 2014-06-06 14:39:57 -05:00
Brian Clements
dc4c7e818b Omaha #3226 added total lightning decoder 
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: f39896b2d1 [formerly 2e445986e2 [formerly c278000764] [formerly f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]
Former-commit-id: 2e445986e2 [formerly c278000764]
Former-commit-id: 2e445986e2
Former-commit-id: eb782b8201
 2014-06-06 14:39:57 -05:00
Brian Clements
ac71b0a984 Omaha #3226 added total lightning decoder 
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: dc4c7e818b [formerly eb782b8201] [formerly 2e445986e2] [formerly 2e445986e2 [formerly c278000764]] [formerly dc4c7e818b [formerly eb782b8201] [formerly 2e445986e2] [formerly 2e445986e2 [formerly c278000764]] [formerly f39896b2d1 [formerly 2e445986e2 [formerly c278000764] [formerly f39896b2d1 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]]]]
Former-commit-id: f39896b2d1
Former-commit-id: dfd01254fd [formerly 04bd60be1d] [formerly 77b1f85fe1] [formerly b2e5430767de18db5acaf4fbb3ba11faf156ce21 [formerly 7f4d763d46a3bdf042a5574c4aafc88355d20fd6] [formerly 77b1f85fe1 [formerly b98a3494fe]]]
Former-commit-id: 0917c30a9f8ded7c1f8f9fe77c1fd407a53250bb [formerly 57e3fc0a6ae1a95a9441bff9f250f3224caa7782] [formerly 8046cbc417 [formerly ca1b869647]]
Former-commit-id: 8046cbc417
Former-commit-id: fd580e44c7
 2014-06-06 14:39:57 -05:00
Steve Harris
1c64a5c025 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 857ae00bea95a7981cb4752c1a7c147d725173e3
 2014-03-06 18:31:10 -06:00
Steve Harris
dc7d6ceced Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]
Former-commit-id: 8b6263bfbd
 2014-03-06 18:31:10 -06:00
Steve Harris
653fb44d87 Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 1c64a5c025 [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]
Former-commit-id: dc7d6ceced [formerly 8b6263bfbd]
Former-commit-id: dc7d6ceced
Former-commit-id: 08dbf1f7ea
 2014-03-06 18:31:10 -06:00
Steve Harris
cb1dc0fbde Merge branch 'omaha_14.2.1' into development (from 14.2.1-9) 
Former-commit-id: 653fb44d87 [formerly 08dbf1f7ea] [formerly dc7d6ceced] [formerly dc7d6ceced [formerly 8b6263bfbd]] [formerly 653fb44d87 [formerly 08dbf1f7ea] [formerly dc7d6ceced] [formerly dc7d6ceced [formerly 8b6263bfbd]] [formerly 1c64a5c025 [formerly dc7d6ceced [formerly 8b6263bfbd] [formerly 1c64a5c025 [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]]]]
Former-commit-id: 1c64a5c025
Former-commit-id: fc1ae80078 [formerly 3f778f9f9f] [formerly 972fa3bee6] [formerly a43476b7803d23c5d5d4c5743c6969b1bf6672b4 [formerly ce9b772480f62374b4f578a3aa3691569ae98b58] [formerly 972fa3bee6 [formerly 7fbbc1e118]]]
Former-commit-id: 1b5f2e57254273452ff3d5388fd45f472403c01b [formerly 4dd289fbedb14cff7837a7f1aeed66c5959e4ee1] [formerly d65c768373 [formerly 7f932399b9]]
Former-commit-id: d65c768373
Former-commit-id: 2acd9aac73
 2014-03-06 18:31:10 -06:00
Steve Harris
a2e36f4c6c Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 22538918b8a7175bbb517cbf65ec3738e65a6eb2
 2014-03-06 18:19:55 -06:00
Steve Harris
3358e8d6ef Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]
Former-commit-id: 7f1ad89df9
 2014-03-06 18:19:55 -06:00
Steve Harris
afbf38d76f Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: a2e36f4c6c [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]
Former-commit-id: 3358e8d6ef [formerly 7f1ad89df9]
Former-commit-id: 3358e8d6ef
Former-commit-id: 93aa41a34b
 2014-03-06 18:19:55 -06:00
Steve Harris
0908bde34a Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: afbf38d76f [formerly 93aa41a34b] [formerly 3358e8d6ef] [formerly 3358e8d6ef [formerly 7f1ad89df9]] [formerly afbf38d76f [formerly 93aa41a34b] [formerly 3358e8d6ef] [formerly 3358e8d6ef [formerly 7f1ad89df9]] [formerly a2e36f4c6c [formerly 3358e8d6ef [formerly 7f1ad89df9] [formerly a2e36f4c6c [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]]]]
Former-commit-id: a2e36f4c6c
Former-commit-id: 0ee6eca712 [formerly 3715195901] [formerly 2371a74a29] [formerly 932e6bd0cced8920652c51cdb795a6002399ca41 [formerly 4de1a1cd26a0d873cc898cd411cc38ab4cc889c6] [formerly 2371a74a29 [formerly 8ec20fc5e9]]]
Former-commit-id: 12bed867bcdd8dca8ff57d7a87ae372836fcc6d9 [formerly 550b2170a0e7b2252cdcb3421b25e5704cf2cdac] [formerly 71c8e15b78 [formerly 104b3d369a]]
Former-commit-id: 71c8e15b78
Former-commit-id: f7a15a87e5
 2014-03-06 18:19:55 -06:00