Merge remote-tracking branch 'pigoz/gl'
commita3ebc5de4bb613008f7c85f221ecfd3665812c68
authorUoti Urpala <uau@mplayer2.org>
Tue, 6 Dec 2011 22:14:03 +0000 (7 00:14 +0200)
committerUoti Urpala <uau@mplayer2.org>
Tue, 6 Dec 2011 22:14:03 +0000 (7 00:14 +0200)
tree42b101b2724414bcce4b4784564ca06da4d133b1
parentfe69b49ccc2bb3e00977f4110a59ffe3b0516d6f
parentb2a41e20be6c1831543e72987ce7d285655fc311
Merge remote-tracking branch 'pigoz/gl'