Merge commit 'b9673bcc4d5ed07fb8461726b7ee1750e75e0a16'
authorTest Robot <wine-patches-test@office.etersoft.ru>
Wed, 30 Mar 2011 15:30:34 +0000 (19:30 +0400)
committerTest Robot <wine-patches-test@office.etersoft.ru>
Wed, 30 Mar 2011 15:30:34 +0000 (19:30 +0400)
commitbd7d2e2e5325e7ccd560e288cb125399a6e18d17
tree226dd22006e8bc80ddd93650eb9aaa11375259f4
parentb2f62456f9814c01efde07aefaa0e3b269cc25e8
parentb9673bcc4d5ed07fb8461726b7ee1750e75e0a16
Merge commit 'b9673bcc4d5ed07fb8461726b7ee1750e75e0a16'
dlls/msi/action.c
dlls/msi/media.c
dlls/winex11.drv/clipboard.c
dlls/winex11.drv/opengl.c
dlls/winex11.drv/window.c
dlls/ws2_32/socket.c