[vlc-devel] [vlc-commits] Merge branch 'master' of git.videolan.org:vlc/vlc-2.0

[Felix Paul Kühne]

On 18.07.2012, at 12:43, Christoph Miebach wrote:

> vlc/vlc-2.0 | branch: master | Christoph Miebach <christoph.miebach at web.de> | Wed Jul 18 12:40:18 2012 +0200| [329f8710a0e680f4af0906c93a45ea3ddea397c7] | committer: Christoph Miebach
> 
> Merge branch 'master' of git.videolan.org:vlc/vlc-2.0

Reverted through a push --force to 64a2b485c1d7ee676074b6afd2baf4145c186968 ("macosx: vlc object handling improvements (refs #6883)"). The lost commit "audioscrobbler: prevent an endless loop inside the main loop" was recreated.

Please be more careful with git next time and ask us if you're unsure.


Best regards,

Felix