[bt-devel] MDI Style ToolBars

[Gary Holmlund]

On 2/23/2010 12:39 PM, Eeli Kaikkonen wrote:
> On Tue, 23 Feb 2010, Gary Holmlund wrote:
>    
>> I have been merging from the trunk. The last merge was only 3 days ago.
>> You can see these in the bzr log.
>>      
> Ah. I just can't find it there, unless you mean 2/20/10 10:42 PM and
> earlier. They don't show as a merge but as simple revisions.
>
> Anyways, I added something about this in
> http://devel.bibletime.info/wiki/BazaarWithSvn#Keeping_your_development_branch_up_to_date_with_trunk.
> It was quite useful to read documentation again - I had forgotten many
> things. :)
>
>    
I mixed up terms. I have been rebasing from the trunk. I will merge to 
the trunk just before a final check in.

Gary