http://git.etersoft.ru/projects / wine / eterwine.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00ae33d e985614)
Merge branch 'master' of git.eter:/projects/eterwine into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Fri, 14 Jan 2011 16:30:03 +0000 (19:30 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Fri, 14 Jan 2011 16:30:03 +0000 (19:30 +0300)
Conflicts:
dlls/kernel32/process.c

1  2 
dlls/mshtml/htmldoc.c patch | diff1 | diff2 | blob | history
etersoft/scripts/wine.in patch | diff1 | diff2 | blob | history

diff --cc dlls/mshtml/htmldoc.c
Simple merge
diff --cc etersoft/scripts/wine.in
Simple merge
eterwine