Merge commit 'f9b97566509582f11727958541c5ad20720a8d6e' into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Thu, 7 Apr 2011 14:53:18 +0000 (18:53 +0400)
committerVitaly Perov <vitperov@etersoft.ru>
Thu, 7 Apr 2011 14:53:18 +0000 (18:53 +0400)
commite98f2d48d1d9092c4386603be51083abe43f5541
tree2cb90f05da7490c0ee8f476630d83c9398ea0d8b
parentda62efddaf66fb589c86e9890d29a29c420011d8
parentf9b97566509582f11727958541c5ad20720a8d6e
Merge commit 'f9b97566509582f11727958541c5ad20720a8d6e' into eterhack

Conflicts:
VERSION
configure
VERSION
configure
dlls/comctl32/listview.c
dlls/shell32/tests/shelldispatch.c
etersoft/wine-etersoft.spec