Merge pure into eterwine
authorVitaly Perov <vitperov@etersoft.ru>
Fri, 25 Feb 2011 17:32:28 +0000 (20:32 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Fri, 25 Feb 2011 17:32:28 +0000 (20:32 +0300)
commitf9b97566509582f11727958541c5ad20720a8d6e
tree3f32a2fc82291b691f653ad7497d9be5a3ef1e1a
parent6b909453a39028a71911433b69cdebd47dc0b63e
parent46f0538ae0f08222290c175bd7a53536c062d8b6
Merge pure into eterwine

Conflicts:
configure
configure
dlls/comctl32/listview.c
dlls/comctl32/tests/listview.c
dlls/wininet/http.c
dlls/wininet/internet.c