| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Wed, 3 Dec 2008 23:55:52 +0000 (4 01:55 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Wed, 3 Dec 2008 23:55:52 +0000 (4 01:55 +0200) | ||
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce | treesnapshot (tar.gz zip) |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 | commitdiff |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 | commitdiff |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
37 files changed: