Merge eterwine into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Tue, 15 Feb 2011 16:45:25 +0000 (19:45 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Tue, 15 Feb 2011 16:45:25 +0000 (19:45 +0300)
commit86cb175ee2c83e5341aeeec74378e07609887ae7
treeaeb851a2afe02ddcacf03a2638e6b29bdb4fb6c9
parentf88b9ba87209241dd7ea41b0e78bbdc64afa11f6
parentda4bfd5764891a39b29fb222768145b85ce28129
Merge eterwine into eterhack

Conflicts:
configure
configure.ac
dlls/oledlg/oledlg_En.rc
dlls/shell32/shres.rc
15 files changed:
configure
configure.ac
dlls/comctl32/imagelist.c
dlls/gdi32/font.c
dlls/msi/package.c
dlls/shell32/Makefile.in
dlls/shell32/shresdef.h
dlls/wineps.drv/download.c
include/config.h.in
include/wincrypt.h
libs/wine/config.c
programs/regedit/framewnd.c
programs/winecfg/En.rc
programs/winecfg/Makefile.in
programs/winecfg/Ru.rc