]> git.sesse.net Git - vlc/commit
Merge branch 1.0-bugfix
authorRémi Denis-Courmont <remi@remlab.net>
Sat, 23 May 2009 09:43:00 +0000 (12:43 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sat, 23 May 2009 09:43:00 +0000 (12:43 +0300)
commit52c18c4dec68158eedd655e0502820b7d7b6128f
tree3edde90d8dfab74c49cc9ac88a3c061af3d4aba6
parent49d534e02090e16db037bf8f8209e15ba8a3ad13
parentdeb3a85153057e12fe59bb5ed24395f0b0012ab0
Merge branch 1.0-bugfix
modules/gui/macosx/controls.h
modules/gui/macosx/controls.m
modules/video_filter/alphamask.c
src/control/media_player.c