Merge commit '206461df996c5fe31158b71e03d38c02b79f572c' into eterhack

author Vitaly Perov <vitperov@etersoft.ru>

Mon, 27 Sep 2010 12:19:44 +0000 (16:19 +0400)

committer Vitaly Perov <vitperov@etersoft.ru>

Mon, 27 Sep 2010 12:19:44 +0000 (16:19 +0400)
author Vitaly Perov <vitperov@etersoft.ru>
Mon, 27 Sep 2010 12:19:44 +0000 (16:19 +0400)
committer Vitaly Perov <vitperov@etersoft.ru>
Mon, 27 Sep 2010 12:19:44 +0000 (16:19 +0400)
diff --cc dlls/user32/painting.c
Simple merge
diff --cc dlls/user32/win.c
Simple merge
diff --cc dlls/user32/win.h
Simple merge
diff --cc dlls/user32/winpos.c
Simple merge
diff --cc server/protocol.def
Simple merge
diff --cc server/window.c
Simple merge
author	Vitaly Perov <vitperov@etersoft.ru>
	Mon, 27 Sep 2010 12:19:44 +0000 (16:19 +0400)
committer	Vitaly Perov <vitperov@etersoft.ru>
	Mon, 27 Sep 2010 12:19:44 +0000 (16:19 +0400)
		1	2
dlls/user32/painting.c	patch \|	diff1 \|	diff2 \|	blob \| history
dlls/user32/win.c	patch \|	diff1 \|	diff2 \|	blob \| history
dlls/user32/win.h	patch \|	diff1 \|	diff2 \|	blob \| history
dlls/user32/winpos.c	patch \|	diff1 \|	diff2 \|	blob \| history
server/protocol.def	patch \|	diff1 \|	diff2 \|	blob \| history
server/window.c	patch \|	diff1 \|	diff2 \|	blob \| history