| commit | ebb4abf2081026c63bb5c983f76447d9d2413656 | |
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Thu, 2 Oct 2008 02:17:23 +0000 (2 05:17 +0300) | ||
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | |
| Thu, 2 Oct 2008 02:17:23 +0000 (2 05:17 +0300) | ||
| tree | f2b3ed868645fd2546173be3500f4c3e0cdf3ecc | treesnapshot (tar.gz zip) |
| parent | 849dc0ba31f209dfdb48146512e48ee2203d0ee6 | commitdiff |
| parent | 20571d6f6870dab84624cc6b6fbac82cde204f16 | commitdiff |
Merge svn changes up to r27682
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c
Addition of the "outdir" suboption to vo_png in svn was reverted
before merging.
Conflicts:
command.c
mplayer.c