]> git.sesse.net Git - vlc/commitdiff
Merge branch 'dynamicoverlay'
authorJean-Paul Saman <jean-paul.saman@m2x.nl>
Wed, 9 Apr 2008 10:45:24 +0000 (12:45 +0200)
committerJean-Paul Saman <jean-paul.saman@m2x.nl>
Wed, 9 Apr 2008 10:45:24 +0000 (12:45 +0200)

Trivial merge