Merge commit 'd8e04b2fb52582d39f2acd59e420108bd7c0affd' into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Sat, 11 Jun 2011 11:28:36 +0000 (15:28 +0400)
committerVitaly Perov <vitperov@etersoft.ru>
Sat, 11 Jun 2011 11:28:36 +0000 (15:28 +0400)
commit662a7f6b0d677e1a59a936e7299b39737a5d03d8
tree33e26db7ab7b528eb9394c2d7caedf795ced8d79
parent0313ef631acb98aa858f3b1407d19f8c7f0453d2
parentd8e04b2fb52582d39f2acd59e420108bd7c0affd
Merge commit 'd8e04b2fb52582d39f2acd59e420108bd7c0affd' into eterhack

Conflicts:
include/wine/server_protocol.h
dlls/comctl32/listview.c
dlls/msi/helpers.c
dlls/oleaut32/olepicture.c
dlls/user32/input.c
dlls/winex11.drv/mouse.c
include/wine/server_protocol.h
server/protocol.def
server/request.h
server/trace.c
server/window.c