Merge eterwine into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Thu, 17 Feb 2011 10:20:11 +0000 (13:20 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Thu, 17 Feb 2011 10:20:11 +0000 (13:20 +0300)
commitd18898b541563587d95f72f8b22e279056d2af2e
tree8c1098702f9da052a240deee215b5ab1e761a954
parent7c2d75ffbdff76338a8bc9bacb7bf29a64ace871
parent4339b23e80c89d1a5a248b6449398c2d4b16d660
Merge eterwine into eterhack

Conflicts:
dlls/shell32/tests/shelldispatch.c
dlls/dinput/mouse.c
dlls/kernel32/module.c
dlls/msi/action.c
dlls/msi/msipriv.h
dlls/winex11.drv/xrender.c
dlls/ws2_32/socket.c
server/registry.c