Etersoft Git - wine/eterwine.git/commit

http://git.etersoft.ru/projects / wine / eterwine.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c025585 57a6404)

author	Vitaly Perov <vitperov@etersoft.ru>
	Mon, 27 Sep 2010 09:26:31 +0000 (13:26 +0400)
committer	Vitaly Perov <vitperov@etersoft.ru>
	Mon, 27 Sep 2010 09:26:31 +0000 (13:26 +0400)
commit	dbe6dd55aab3de9d196b8b57558d299cc8028bb9
tree	78002070ce11673fadc8014d5ba2f114ceda92f6	tree
parent	c02558514d0253c6d67fef724cd408c024392c8f	commit \| diff
parent	57a64040e3108e8b628d0843c094089b59c56dfe	commit \| diff

Merge branch 'pure'

Conflicts:
dlls/user32/win.c

configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
dlls/iphlpapi/iphlpapi_main.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/controls.h	diff1 \|	diff2 \|	blob \| history
dlls/user32/nonclient.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/win.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/winpos.c	diff1 \|	diff2 \|	blob \| history
dlls/wineps.drv/escape.c	diff1 \|	diff2 \|	blob \| history

eterwine