Etersoft Git - wine/eterwine.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 2d0f917 5eb8ffe)

author	Vitaly Perov <vitperov@etersoft.ru>
	Tue, 28 Jun 2011 09:45:14 +0000 (13:45 +0400)
committer	Vitaly Perov <vitperov@etersoft.ru>
	Tue, 28 Jun 2011 09:45:14 +0000 (13:45 +0400)
commit	80bc8b91a3d96b3abc92344ff972562ff876749a
tree	1cad08f072206bc74e51d1b3fff412bfd2969d18	tree
parent	2d0f91727f86bf85ae319526a3dec8cbfa397fe0	commit \| diff
parent	5eb8ffee19d47d3977cd52b69b6778076288e6ec	commit \| diff

Merge commit '5eb8ffee19d47d3977cd52b69b6778076288e6ec' into eterhack

Conflicts:
VERSION
configure
include/wine/server_protocol.h

13 files changed:

VERSION	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
dlls/comdlg32/filedlg.c	diff1 \|	diff2 \|	blob \| history
dlls/msi/action.c	diff1 \|	diff2 \|	blob \| history
dlls/msi/msipriv.h	diff1 \|	diff2 \|	blob \| history
dlls/user32/input.c	diff1 \|	diff2 \|	blob \| history
etersoft/wine-etersoft.spec	diff1 \|	\|	blob \| history
include/wine/server_protocol.h	diff1 \|	diff2 \|	blob \| history
programs/regedit/framewnd.c	diff1 \|	diff2 \|	blob \| history
server/protocol.def	diff1 \|	diff2 \|	blob \| history
server/request.h	diff1 \|	diff2 \|	blob \| history
server/trace.c	diff1 \|	diff2 \|	blob \| history
server/window.c	diff1 \|	diff2 \|	blob \| history

eterwine