Merge branch 'pure'
authorVitaly Perov <vitperov@etersoft.ru>
Wed, 1 Sep 2010 14:37:56 +0000 (18:37 +0400)
committerVitaly Perov <vitperov@etersoft.ru>
Wed, 1 Sep 2010 14:37:56 +0000 (18:37 +0400)
commit200e53cb1c515e2d2bbcbb306611e5d600905542
tree68f81756d287c25c74b9660f70d9d6a7f161f26e
parent477e22b7c86d6f3bd06daa6b13584af80064400b
parent8b2a403a7dc32febc3b554961606c2b1e3ffe6da
Merge branch 'pure'

Conflicts:
dlls/shdocvw/webbrowser.c
15 files changed:
.gitignore
configure
configure.ac
dlls/advapi32/security.c
dlls/comctl32/treeview.c
dlls/comdlg32/filedlg31.c
dlls/gdi32/font.c
dlls/gdi32/freetype.c
dlls/setupapi/setupapi.spec
dlls/setupapi/stubs.c
dlls/shdocvw/navigate.c
dlls/shdocvw/webbrowser.c
dlls/winex11.drv/graphics.c
loader/preloader.c
tools/wine.inf.in