| commit | 09eb818ca8df63a9a20a06d3345fccc773569bdf | |
| author | Martin Jansa <Martin.Jansa@gmail.com> | |
| Mon, 31 Jan 2011 09:09:12 +0000 (31 10:09 +0100) | ||
| committer | Martin Jansa <Martin.Jansa@gmail.com> | |
| Mon, 31 Jan 2011 09:09:12 +0000 (31 10:09 +0100) | ||
| tree | bef09119acf09ed608d871e0668ca6da7ec349ed | treesnapshot (tar.gz zip) |
| parent | 81f0b8dacff926d46438faedb1a56da3946a8d2a | commitdiff |
| parent | da8c1995056dd6dfb982d612dcd238ae925bd90c | commitdiff |
Merge remote-tracking branch 'mplayer/master'
Conflicts:
configure
Conflicts:
configure