Merge branch 'pure'
authorVitaly Perov <vitperov@etersoft.ru>
Fri, 28 Jan 2011 11:14:51 +0000 (14:14 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Fri, 28 Jan 2011 11:14:51 +0000 (14:14 +0300)
commit608fd5ce054667bd55bc5bbd6ff39288008d5a6b
tree7c536ea66a6a9d3923969bb173c4f2e8bbe739ef
parent6507d06aed73b74852f5fc29d04898ac0e7ef9d3
parentfe6735b184d0067424647fdb69eba4a2a67a6165
Merge branch 'pure'

Conflicts:
configure
configure
configure.ac
dlls/mshtml/mshtml_private.h
dlls/setupapi/setupapi.spec
dlls/setupapi/stubs.c