Merge commit 'c61fabbc31f05af48829a3bc01c3727e715be582' into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Mon, 18 Jul 2011 12:47:58 +0000 (16:47 +0400)
committerVitaly Perov <vitperov@etersoft.ru>
Mon, 18 Jul 2011 12:47:58 +0000 (16:47 +0400)
commit9c62d7247daf087013e41110fcb2140e96ba3eda
tree8a668ed5ffb5ecfad5d0b28a0a4c1e3808220695
parenta0cd4849efe1dafd6ecc54738af1fa9f9b49c823
parentc61fabbc31f05af48829a3bc01c3727e715be582
Merge commit 'c61fabbc31f05af48829a3bc01c3727e715be582' into eterhack

Conflicts:
dlls/crypt32/crypt32_private.h
dlls/msi/msipriv.h
include/wine/server_protocol.h
21 files changed:
dlls/comctl32/tab.c
dlls/crypt32/crypt32_private.h
dlls/kernel32/kernel_private.h
dlls/mshtml/nsembed.c
dlls/msi/msipriv.h
dlls/ntdll/ntdll_misc.h
dlls/user32/input.c
dlls/user32/menu.c
dlls/user32/message.c
dlls/user32/user_private.h
dlls/winex11.drv/event.c
dlls/winex11.drv/mouse.c
dlls/winex11.drv/window.c
dlls/winex11.drv/x11drv.h
dlls/winspool.drv/info.c
include/wine/server_protocol.h
programs/services/services.c
server/file.c
server/protocol.def
server/request.h
server/trace.c