]> git.sesse.net Git - vlc/commit
Merge commit 'origin/1.0-bugfix'
authorLaurent Aimar <fenrir@videolan.org>
Fri, 15 May 2009 23:09:40 +0000 (01:09 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Fri, 15 May 2009 23:09:40 +0000 (01:09 +0200)
commit89b6530d8abd99b96b9f33af022022241fe97ee2
tree5390f03abcf1d2b1963b4f57ff8267a2884a538c
parente169fa3a3781d3bf98cdb23db7b41c9e50d10d0a
parentda62e6d3fd7d110eeb2cf34a17cbc9c16732f2fe
Merge commit 'origin/1.0-bugfix'

Conflicts:

modules/codec/dmo/dmo.c
modules/codec/dmo/dmo.c
src/input/input.c