]> git.sesse.net Git - vlc/commitdiff
projects / vlc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 97ada6d e936fbd)
Merge commit 'origin/1.0-bugfix'
authorJean-Baptiste Kempf <jb@videolan.org>
Thu, 14 May 2009 21:20:40 +0000 (23:20 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 14 May 2009 21:20:40 +0000 (23:20 +0200)
1  2 
src/input/input.c patch | diff1 | diff2 | blob | history

diff --cc src/input/input.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.