Merge lp://staging/~gloriajw/plover/windows into lp://staging/~hesky-fisher/plover/windows

Mirabai, you may want to make your own branch, so you can control the merge of changes into it, and find this easier to manage.

On 1/29/2012 11:12 PM, Gloria W wrote:
> Mirabai, you may want to make your own branch, so you can control the merge of changes into it, and find this easier to manage.
Gloria, is this now Plover 2.2 (the current Plover), or "just" fixes to
Hesky's version, which I believe was one version number back?

Michael

On 01/29/2012 11:31 PM, Michael Roberts wrote:
> On 1/29/2012 11:12 PM, Gloria W wrote:
>> Mirabai, you may want to make your own branch, so you can control the merge of changes into it, and find this easier to manage.
> Gloria, is this now Plover 2.2 (the current Plover), or "just" fixes to
> Hesky's version, which I believe was one version number back?
>
> Michael
>
>
This is a fix to hesky's version. I can update this branch to make it
2.2 compliant, but after that, maybe we should merge it back into the trunk.

On 1/29/2012 11:37 PM, Gloria W wrote:
> On 01/29/2012 11:31 PM, Michael Roberts wrote:
>> On 1/29/2012 11:12 PM, Gloria W wrote:
>>> Mirabai, you may want to make your own branch, so you can control the merge of changes into it, and find this easier to manage.
>> Gloria, is this now Plover 2.2 (the current Plover), or "just" fixes to
>> Hesky's version, which I believe was one version number back?
>>
>> Michael
>>
>>
> This is a fix to hesky's version. I can update this branch to make it
> 2.2 compliant, but after that, maybe we should merge it back into the trunk.
>
Ideally, I'd like to see a single version that runs under both Linux and
Windows, and merge everything back together, and that's going to be a
whole lot easier once we're up to 2.2 on Windows. I can help out if you
like, or stay out of your way if you prefer. :-)

On 1/30/2012 12:04 AM, Michael Roberts wrote:
> On 1/29/2012 11:37 PM, Gloria W wrote:
>
>> On 01/29/2012 11:31 PM, Michael Roberts wrote:
>>
>>> On 1/29/2012 11:12 PM, Gloria W wrote:
>>>
>>>> Mirabai, you may want to make your own branch, so you can control the merge of changes into it, and find this easier to manage.
>>>>
>>> Gloria, is this now Plover 2.2 (the current Plover), or "just" fixes to
>>> Hesky's version, which I believe was one version number back?
>>>
>>> Michael
>>>
>>>
>>>
>> This is a fix to hesky's version. I can update this branch to make it
>> 2.2 compliant, but after that, maybe we should merge it back into the trunk.
>>
>>
> Ideally, I'd like to see a single version that runs under both Linux and
> Windows, and merge everything back together, and that's going to be a
> whole lot easier once we're up to 2.2 on Windows. I can help out if you
> like, or stay out of your way if you prefer. :-)
>
>
I'd like to see that as well. I did a massive diff/merge with 2.2, and I
am testing now. I am certain I'll need help. Give me a bit to knock the
kinks out, then I'll submit the branch for testing and your review.