| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Tue, 9 Mar 2010 21:37:00 +0000 (9 23:37 +0200) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Tue, 9 Mar 2010 21:37:00 +0000 (9 23:37 +0200) | ||
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 | treesnapshot (tar.gz zip) |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f | commitdiff |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade | commitdiff |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Conflicts:
mplayer.c
vidix/nvidia_vid.c