Etersoft Git - wine/eterwine.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: e05d7f3 c4b95e3)

author	Vitaly Perov <vitperov@etersoft.ru>
	Mon, 27 Jun 2011 11:14:57 +0000 (15:14 +0400)
committer	Vitaly Perov <vitperov@etersoft.ru>
	Mon, 27 Jun 2011 11:14:57 +0000 (15:14 +0400)
commit	cc79035014b7cb18b332979f749f27e8e464b9ef
tree	4fa81a755e638b8df54f9f73717c465e3d9b1d91	tree
parent	e05d7f3a2be513c3319a6a11dedb9b358b4eb1d8	commit \| diff
parent	c4b95e3e86bf426f76f1a0d818d7a3f37c3f2b52	commit \| diff

Merge commit 'c4b95e3e86bf426f76f1a0d818d7a3f37c3f2b52' into eterhack

Conflicts:
VERSION
configure
etersoft/init/config

VERSION	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
dlls/kernel32/process.c	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/winex11.drv.spec	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/x11drv.h	diff1 \|	diff2 \|	blob \| history
etersoft/scripts/wine.in	diff1 \|	diff2 \|	blob \| history
etersoft/wine-etersoft.spec	diff1 \|	\|	blob \| history
server/file.c	diff1 \|	diff2 \|	blob \| history

eterwine