Waldemar Brodkorb f14c1fc551 resolve merge conflict 11 years ago
..
patches f1a694baf2 fix mplayer for x86 build 11 years ago
Makefile f14c1fc551 resolve merge conflict 11 years ago