Merge eterwine into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Mon, 24 Jan 2011 14:43:33 +0000 (17:43 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Mon, 24 Jan 2011 14:43:33 +0000 (17:43 +0300)
commitded67ec0dcada23babe008fb18ec308f323a4597
treea52bc69c893c51deb122e9c30ac414e2323c16bf
parentf82d207887f430b136ec1c76efc6f80f62b3fb7c
parentb26094efbc625cfacf3da5c14a34e237157f66cc
Merge eterwine into eterhack

Conflicts:
configure
configure.ac
configure
configure.ac
dlls/mshtml/htmldoc.c
dlls/mshtml/nsembed.c
include/config.h.in