Merge branch '10bit'
commitfd01bee8f7ad057e79202a6ce2aaa65875862794
authorUoti Urpala <uau@mplayer2.org>
Sun, 26 Jun 2011 03:28:14 +0000 (26 06:28 +0300)
committerUoti Urpala <uau@mplayer2.org>
Sun, 26 Jun 2011 03:28:18 +0000 (26 06:28 +0300)
treee815b4a8e58d67cea212abb46cd62a5eda5c1088
parent48e85562982aee72f055b5ca523ff73bfe34cc43
parentd3bef0286bc0688da91452f6e07429052d324b51
Merge branch '10bit'