Etersoft Git - wine/eterwine.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: c6825a0 f97e12e)

author	Vitaly Perov <vitperov@etersoft.ru>
	Thu, 7 Apr 2011 14:02:38 +0000 (18:02 +0400)
committer	Vitaly Perov <vitperov@etersoft.ru>
	Thu, 7 Apr 2011 14:02:38 +0000 (18:02 +0400)
commit	090e989b445762dcdd54c6ba2f20d3e0d669bcde
tree	f2654437738b4717d6abc44ff5dc8986b1838261	tree
parent	c6825a0a42ef5cac3b44ba195d4b1e6aa5da0e72	commit \| diff
parent	f97e12e4dc3216f692c79afff6ed0857c4859cda	commit \| diff

Merge eterwine into eterhack

Conflicts:
dlls/ntoskrnl.exe/ntoskrnl.c
etersoft/freebsd/wine-etersoft-public/pkg-plist

configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
dlls/dinput/device.c	diff1 \|	diff2 \|	blob \| history
dlls/gdi32/font.c	diff1 \|	diff2 \|	blob \| history
dlls/msi/files.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/directory.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/file.c	diff1 \|	diff2 \|	blob \| history
dlls/shell32/tests/shelldispatch.c	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/dib.c	diff1 \|	diff2 \|	blob \| history
etersoft/init/config	diff1 \|	diff2 \|	blob \| history
etersoft/scripts/wine.in	diff1 \|	diff2 \|	blob \| history

eterwine