| commit | fccb0a7e45b61128262a396f2426bd7168fd198c | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Sun, 21 Dec 2008 22:46:02 +0000 (22 00:46 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Sun, 21 Dec 2008 22:46:02 +0000 (22 00:46 +0200) | ||
| tree | ac09e6b90d4389717f32181f8b6f3848ffb149fe | treesnapshot (tar.gz zip) |
| parent | 71b25cca7644ab059393e9ee4682d79aab41ceba | commitdiff |
| parent | ce821bd91f0b0c67b96f5d3b8f3fda19e1015294 | commitdiff |
Merge svn changes up to r28176
Conflicts:
libvo/video_out.c
libvo/x11_common.c
Conflicts:
libvo/video_out.c
libvo/x11_common.c