| commit | 18ae04330acaa9212b422e71eee239eacd475805 | |
| author | Martin Jansa <Martin.Jansa@gmail.com> | |
| Sun, 10 Jan 2010 12:13:41 +0000 (10 13:13 +0100) | ||
| committer | Martin Jansa <Martin.Jansa@gmail.com> | |
| Sun, 10 Jan 2010 12:13:41 +0000 (10 13:13 +0100) | ||
| tree | 0c06bb0c1441418f0405abc5859ee0c8ae8a5b3c | treesnapshot (tar.gz zip) |
| parent | 5519d0dfd3f9504f24aa9fe154f831bb718cbfc3 | commitdiff |
| parent | 23e693d6d2e6d0da74b40ccb8a9f438a9dd846c2 | commitdiff |
Merge remote branch 'mplayer/master'
Conflicts:
configure
Conflicts:
configure