| commit | e7d20d354f49f408f5f4096390c6f73005f8eaf4 | |
| author | Martin Jansa <Martin.Jansa@gmail.com> | |
| Wed, 23 Jun 2010 10:26:40 +0000 (23 12:26 +0200) | ||
| committer | Martin Jansa <Martin.Jansa@gmail.com> | |
| Wed, 23 Jun 2010 10:26:40 +0000 (23 12:26 +0200) | ||
| tree | e72959535770d669538d3dfcd2293e2b8307c455 | treesnapshot (tar.gz zip) |
| parent | e64bef6a821e12e4a2fabeae15a2dfeef2ab460b | commitdiff |
| parent | 2b252e9acf5391fc5e250582b5f89b28481f757b | commitdiff |
Merge remote branch 'mplayer/master'
Conflicts:
Makefile
codec-cfg.c
Conflicts:
Makefile
codec-cfg.c