Etersoft Git - wine/eterwine.git/commit

author	Vitaly Lipatov <lav@etersoft.ru>
	Wed, 25 Jun 2008 09:29:25 +0000 (13:29 +0400)
committer	Vitaly Lipatov <lav@etersoft.ru>
	Wed, 25 Jun 2008 09:29:25 +0000 (13:29 +0400)
commit	70cb4323f6054c73cdaedbd4ae7907f18f698baf
tree	fdc209b74e083aec6d615a142f0f9d7ac613448c	tree
parent	eab60c69593e5797404a57717e6047c96b8aa3bf	commit \| diff
parent	c00df3b35d8421fe8d638fb24c8a7afe8ee64aab	commit \| diff

Merge branch 'master' of git.eter:/people/kondratyuk/packages/wine

Conflicts:

configure
dlls/ntdll/serial.c
dlls/user32/menu.c

28 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
dlls/Makefile.in	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/listview.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/tab.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/tests/listview.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/treeview.c	diff1 \|	diff2 \|	blob \| history
dlls/comdlg32/filedlg.c	diff1 \|	diff2 \|	blob \| history
dlls/kernel32/module.c	diff1 \|	diff2 \|	blob \| history
dlls/kernel32/tests/locale.c	diff1 \|	diff2 \|	blob \| history
dlls/mshtml/htmlelem.c	diff1 \|	diff2 \|	blob \| history
dlls/mshtml/htmlwindow.c	diff1 \|	diff2 \|	blob \| history
dlls/msi/action.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/file.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/serial.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/mdi.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/menu.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/scroll.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/sysparams.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/winpos.c	diff1 \|	diff2 \|	blob \| history
dlls/wined3d/context.c	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/keyboard.c	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/window.c	diff1 \|	diff2 \|	blob \| history
dlls/winspool.drv/info.c	diff1 \|	diff2 \|	blob \| history
programs/Makefile.in	diff1 \|	diff2 \|	blob \| history
programs/winemenubuilder/winemenubuilder.c	diff1 \|	diff2 \|	blob \| history
tools/wine.inf.in	diff1 \|	diff2 \|	blob \| history

eterwine

Makefile.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
dlls/Makefile.in	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/listview.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/tab.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/tests/listview.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/treeview.c	diff1 \|	diff2 \|	blob \| history
dlls/comdlg32/filedlg.c	diff1 \|	diff2 \|	blob \| history
dlls/kernel32/module.c	diff1 \|	diff2 \|	blob \| history
dlls/kernel32/tests/locale.c	diff1 \|	diff2 \|	blob \| history
dlls/mshtml/htmlelem.c	diff1 \|	diff2 \|	blob \| history
dlls/mshtml/htmlwindow.c	diff1 \|	diff2 \|	blob \| history
dlls/msi/action.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/file.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/serial.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/mdi.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/menu.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/scroll.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/sysparams.c	diff1 \|	diff2 \|	blob \| history
dlls/user32/winpos.c	diff1 \|	diff2 \|	blob \| history
dlls/wined3d/context.c	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/keyboard.c	diff1 \|	diff2 \|	blob \| history
dlls/winex11.drv/window.c	diff1 \|	diff2 \|	blob \| history
dlls/winspool.drv/info.c	diff1 \|	diff2 \|	blob \| history
programs/Makefile.in	diff1 \|	diff2 \|	blob \| history
programs/winemenubuilder/winemenubuilder.c	diff1 \|	diff2 \|	blob \| history
tools/wine.inf.in	diff1 \|	diff2 \|	blob \| history