[vlc-devel] [vlc-commits] Merge branch 'smf-seek'

[Rémi Denis-Courmont]

Le 2014-07-11 10:45, Jean-Baptiste Kempf a écrit :
> On 10 Jul, Jean-Baptiste Kempf wrote :
>> On 10 Jul, Rémi Denis-Courmont wrote :
>> > vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu 
>> Jul 10 20:51:15 2014 +0300| [abb3237e150974a1d3b772b7a5458d3d2e028124] 
>> | committer: Rémi Denis-Courmont
>> >
>> > Merge branch 'smf-seek'
>>
>> Do we do merge commits now?
>
> Since I got no answer, I guessed it was a mistake.

I don't answer at night, and not consistently in the morning either. No 
it was not a mistake

You broke my trees, I will have to force push this back to original 
shape.

-- 
Rémi Denis-Courmont