Merge commit '2e6e57c1b1fe1a2c30d1107316c7524c9d44a336' into eterhack
authorAlexander Morozov <amorozov@etersoft.ru>
Mon, 18 Jul 2011 10:12:17 +0000 (14:12 +0400)
committerAlexander Morozov <amorozov@etersoft.ru>
Mon, 18 Jul 2011 10:30:26 +0000 (14:30 +0400)
commit7e62bd8ff7b8f5287e209f621990d4c2af372a99
tree3907406e84aee6b105b8f5eeb7fa32037bdc0437
parentf8741f78cbd34ab99a6f29ce32e8f6f4d8626811
parent2e6e57c1b1fe1a2c30d1107316c7524c9d44a336
Merge commit '2e6e57c1b1fe1a2c30d1107316c7524c9d44a336' into eterhack

Conflicts:
include/wine/server_protocol.h
server/fd.c
24 files changed:
configure
configure.ac
dlls/kernel32/process.c
dlls/krnl386.exe16/instr.c
dlls/msi/dialog.c
dlls/msi/msipriv.h
dlls/ntdll/loader.c
dlls/ntdll/server.c
dlls/winex11.drv/event.c
dlls/winex11.drv/keyboard.c
dlls/winex11.drv/window.c
dlls/ws2_32/socket.c
include/Makefile.in
include/wine/server_protocol.h
programs/regedit/framewnd.c
server/fd.c
server/file.c
server/object.h
server/process.c
server/protocol.def
server/request.h
server/trace.c
tools/wine.inf.in
tools/winebuild/spec32.c