| commit | 5c6795a687cd9149e57985b632cf7a1c4a5c8310 | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Tue, 9 Mar 2010 17:34:30 +0000 (9 19:34 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Tue, 9 Mar 2010 17:34:30 +0000 (9 19:34 +0200) | ||
| tree | 60f61ddbcd8aa96f04b9851029923d81d0b0be89 | treesnapshot (tar.gz zip) |
| parent | 8a93561c8187058ae6278c9c6adb5ada7bedeff4 | commitdiff |
| parent | d7a1d12f6147b53944a56117feae66d8e0e52fb1 | commitdiff |
Merge svn changes up to r30494
Conflicts:
libvo/vo_gl.c
libvo/x11_common.c
Conflicts:
libvo/vo_gl.c
libvo/x11_common.c
| Changelog | diff1 | diff2 | blobhistory |
| DOCS/man/en/mplayer.1 | diff1 | diff2 | blobhistory |
| libvo/vo_gl.c | diff1 | diff2 | blobhistory |
| libvo/x11_common.c | diff1 | diff2 | blobhistory |