Module: wine Branch: master Commit: 115ad2da7a545434c81222d291d147fa63324dbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=115ad2da7a545434c81222d291...
Author: Vincent Povirk vincent@codeweavers.com Date: Tue Apr 5 10:58:39 2016 -0500
mscoree: Update Wine Mono to 4.6.2.
Signed-off-by: Vincent Povirk vincent@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index a39d0fb..8cbc221 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -64,8 +64,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif
-#define MONO_VERSION "4.6.0" -#define MONO_SHA "3a494b5b74fd17adf675a620d46b2dc1d2482424" +#define MONO_VERSION "4.6.2" +#define MONO_SHA "0a5090a3b81b6250a5d7104fc585bd871a9e467d"
typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7181b4b..033a121 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -675,7 +675,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret;
- static const char* mono_version = "4.6.0"; + static const char* mono_version = "4.6.2"; static const char* mono_product_code = "{E45D8920-A758-4088-B6C6-31DBB276992E}";
static const WCHAR controlW[] = {'\','c','o','n','t','r','o','l','.','e','x','e',0};