Merge eterwine into eterhack
authorVitaly Perov <vitperov@etersoft.ru>
Fri, 28 Jan 2011 10:36:05 +0000 (13:36 +0300)
committerVitaly Perov <vitperov@etersoft.ru>
Fri, 28 Jan 2011 10:36:05 +0000 (13:36 +0300)
commit13df8b5faaad385a19046d8bb9b9a73b06f4bd93
tree1b6257afa854dc3a697e12c3f1c5d23f16b9e1aa
parent0c1dc51bb54f54341ccbc86aa8500d64de0100c4
parentb7376f79509d3e5dfe6961f7a885cc099e05b662
Merge eterwine into eterhack

Conflicts:
configure
configure.ac
configure
configure.ac
dlls/wineps.drv/init.c
dlls/winex11.drv/keyboard.c
include/config.h.in