Etersoft Git - wine/eterwine.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 383f1de c4b56ad)

author	Vitaly Lipatov <lav@etersoft.ru>
	Sat, 28 Mar 2009 13:27:16 +0000 (16:27 +0300)
committer	Vitaly Lipatov <lav@etersoft.ru>
	Sat, 28 Mar 2009 13:27:16 +0000 (16:27 +0300)
commit	07fb731dd9f3b08548bbd7341982b5ad7908091d
tree	a4775809eab4e23bbcd8bcf1bce44a6a021f2210	tree
parent	383f1dea9a06d3e54d190ead4b8a4fbc5c3309ab	commit \| diff
parent	c4b56ad2f517ede5848df820cccbd6debb802b94	commit \| diff

Merge branch 'master' of /srv/lav/Projects/WINE/eterwine into eterhack

Conflicts:
VERSION
configure

configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
dlls/advapi32/service.c	diff1 \|	diff2 \|	blob \| history
dlls/comctl32/tab.c	diff1 \|	diff2 \|	blob \| history
dlls/msi/package.c	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/Makefile.in	diff1 \|	diff2 \|	blob \| history
dlls/ntdll/thread.c	diff1 \|	diff2 \|	blob \| history
dlls/rpcrt4/rpc_server.c	diff1 \|	diff2 \|	blob \| history
include/config.h.in	diff1 \|	diff2 \|	blob \| history

eterwine