| commit | 030130942562bb7b84eeba53e0226abed5a63a4c | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Sat, 25 Oct 2008 02:12:34 +0000 (25 05:12 +0300) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Sat, 25 Oct 2008 02:12:34 +0000 (25 05:12 +0300) | ||
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 | treesnapshot (tar.gz zip) |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 | commitdiff |
| parent | 15a80092161a1cd305f8005c780c744416a5252b | commitdiff |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
57 files changed: