Merge svn change r30560
commitc31aa7b9536db6db0523c93fbcd701665ca5ac58
authorUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:18:19 +0000 (9 23:18 +0200)
committerUoti Urpala <uau@glyph.nonexistent.invalid>
Tue, 9 Mar 2010 21:18:19 +0000 (9 23:18 +0200)
tree67e024d3bcfaeb39a22f18a4ee76ce37a0a5a23c
parentad43180c1617d24bf53f07b952b28f381ea8c758
parent8a67379319806dedf421f5bf217091084baab573
Merge svn change r30560
mp_core.h
mplayer.c