[Libreoffice-commits] core.git: 58 commits

[Stephan Bergmann]

On 12/09/2014 01:36 PM, Jennifer Liebel wrote:
[...]
> New commits:
> commit 1367e4b2aff3908b6744c89ec2500b56f30f09b6
> Author: Jennifer Liebel <jliebel94 at gmail.com>
> Date:   Thu Nov 13 13:10:55 2014 +0000
>
>      changed timers to idle
>
>      Change-Id: I05ccb8bd73070462edcc911956859aa7967b5901
[...]

Please be very careful when merging branches and resolving conflicts. 
While most of your apparent net changes

> git diff 379f61127e9851e91197007c706c24f479da2b38^ 1367e4b2aff3908b6744c89ec2500b56f30f09b6

look reasonable (but please do review it carefully once again), you did 
re-introduce the bogus 759c4d18d57b06dcc26fb82759599a29c61ef853 "Fix 
common typos. No automatic tools. Handmade…" (meanwhile reverted again), 
and e.g. temporarily reverted parts of 
fc9e78f4498a3b44be72e13c0c64d235f62b8a99 "framework: avoid double-free 
in ToolBarManager()" with apparent broken merge commit 
18102201f4a68bc41f7caa21fc22ec761812b70b "changed some timer to idle" 
before fixing up the lost part again with 
9cc2a28323e2c7209e3dae8ec52fc685215e9357 "framework: avoid double-free 
in ToolBarManager()," needlessly confusing humans and bisect.