Merge branch 'upstream'
Former-commit-id: a22ccd66e2192337c2fea858f256a0886784a0ad
This commit is contained in:
commit
12b2b2c38a
@ -1 +1 @@
|
||||
a8d7422c4f6a439dc859c845f8066ea47dab4041
|
||||
6d98fb49b3272a7bb8ca47900dd3c42085b23a87
|
@ -1 +1 @@
|
||||
a18c1c630aa49cd3ddbb5bec61c5c7dd6ec042a0
|
||||
ca1c7539f927b2dfd976e7a4a1dae1311fb55899
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.228";
|
||||
public const string MonoVersion = "5.20.0.229";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -1 +1 @@
|
||||
31db378964dbacb78da84dfae470dffaeaaca85b
|
||||
a3bc3e9b1bbbe327ff01a4b4fa6f47f496574724
|
@ -1 +1 @@
|
||||
6c595c7630d487c38279937694571f56b66a6fb1
|
||||
5483a2633a84f8aba73cb6022eb9ded0476f9c61
|
@ -1 +1 @@
|
||||
aeff3ad856f64ba67c8cb844fc94b2e1ddc93ed3
|
||||
5750f5f5fffae7beb6c36e2bed2433e4c3fc8989
|
Binary file not shown.
@ -1 +1 @@
|
||||
89df127a3ffb2960675ac65231c91d34c9be48e3
|
||||
d593a7c89a5ac50142b506d049c93a2204c0d9ff
|
@ -1 +1 @@
|
||||
ce48dcdbfc1c804bbd0bf908793526fc188e866a
|
||||
b216948c6c4a3e4289b78a33c764ba874a976677
|
@ -1 +1 @@
|
||||
0c4f83094675ec4085980065623a1f35bb322c4c
|
||||
018a573c3945db63850d5a7c9a9ff722b9e82b90
|
@ -1 +1 @@
|
||||
8d144ffa71f77885dfa516f758685d8aeedc8d18
|
||||
f442b8cbdf434b1c3e5c9a36ebd3621b12ae8bf4
|
@ -1 +1 @@
|
||||
31db378964dbacb78da84dfae470dffaeaaca85b
|
||||
a3bc3e9b1bbbe327ff01a4b4fa6f47f496574724
|
@ -1 +1 @@
|
||||
6c595c7630d487c38279937694571f56b66a6fb1
|
||||
5483a2633a84f8aba73cb6022eb9ded0476f9c61
|
@ -1 +1 @@
|
||||
aeff3ad856f64ba67c8cb844fc94b2e1ddc93ed3
|
||||
5750f5f5fffae7beb6c36e2bed2433e4c3fc8989
|
Binary file not shown.
@ -1 +1 @@
|
||||
89df127a3ffb2960675ac65231c91d34c9be48e3
|
||||
d593a7c89a5ac50142b506d049c93a2204c0d9ff
|
@ -1 +1 @@
|
||||
ce48dcdbfc1c804bbd0bf908793526fc188e866a
|
||||
b216948c6c4a3e4289b78a33c764ba874a976677
|
@ -1 +1 @@
|
||||
0c4f83094675ec4085980065623a1f35bb322c4c
|
||||
018a573c3945db63850d5a7c9a9ff722b9e82b90
|
@ -1 +1 @@
|
||||
8d144ffa71f77885dfa516f758685d8aeedc8d18
|
||||
f442b8cbdf434b1c3e5c9a36ebd3621b12ae8bf4
|
@ -1 +1 @@
|
||||
31db378964dbacb78da84dfae470dffaeaaca85b
|
||||
a3bc3e9b1bbbe327ff01a4b4fa6f47f496574724
|
@ -1 +1 @@
|
||||
6c595c7630d487c38279937694571f56b66a6fb1
|
||||
5483a2633a84f8aba73cb6022eb9ded0476f9c61
|
@ -1 +1 @@
|
||||
aeff3ad856f64ba67c8cb844fc94b2e1ddc93ed3
|
||||
5750f5f5fffae7beb6c36e2bed2433e4c3fc8989
|
Binary file not shown.
@ -1 +1 @@
|
||||
89df127a3ffb2960675ac65231c91d34c9be48e3
|
||||
d593a7c89a5ac50142b506d049c93a2204c0d9ff
|
@ -1 +1 @@
|
||||
ce48dcdbfc1c804bbd0bf908793526fc188e866a
|
||||
b216948c6c4a3e4289b78a33c764ba874a976677
|
@ -1 +1 @@
|
||||
0c4f83094675ec4085980065623a1f35bb322c4c
|
||||
018a573c3945db63850d5a7c9a9ff722b9e82b90
|
@ -1 +1 @@
|
||||
8d144ffa71f77885dfa516f758685d8aeedc8d18
|
||||
f442b8cbdf434b1c3e5c9a36ebd3621b12ae8bf4
|
@ -1 +1 @@
|
||||
31db378964dbacb78da84dfae470dffaeaaca85b
|
||||
a3bc3e9b1bbbe327ff01a4b4fa6f47f496574724
|
@ -1 +1 @@
|
||||
6c595c7630d487c38279937694571f56b66a6fb1
|
||||
5483a2633a84f8aba73cb6022eb9ded0476f9c61
|
@ -1 +1 @@
|
||||
aeff3ad856f64ba67c8cb844fc94b2e1ddc93ed3
|
||||
5750f5f5fffae7beb6c36e2bed2433e4c3fc8989
|
Binary file not shown.
@ -1 +1 @@
|
||||
89df127a3ffb2960675ac65231c91d34c9be48e3
|
||||
d593a7c89a5ac50142b506d049c93a2204c0d9ff
|
@ -1 +1 @@
|
||||
ce48dcdbfc1c804bbd0bf908793526fc188e866a
|
||||
b216948c6c4a3e4289b78a33c764ba874a976677
|
@ -1 +1 @@
|
||||
0c4f83094675ec4085980065623a1f35bb322c4c
|
||||
018a573c3945db63850d5a7c9a9ff722b9e82b90
|
@ -1 +1 @@
|
||||
8d144ffa71f77885dfa516f758685d8aeedc8d18
|
||||
f442b8cbdf434b1c3e5c9a36ebd3621b12ae8bf4
|
@ -1 +1 @@
|
||||
8b3b7c93974655f7f56c4a5f073b762edb568448
|
||||
a3f36e4c8dd3d07809567960ad2afa58934260eb
|
@ -74,6 +74,12 @@ class InterpClass
|
||||
return i;
|
||||
}
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static int entry_deep_generic_vt (int i, decimal? b) {
|
||||
return i;
|
||||
}
|
||||
|
||||
|
||||
[MethodImplAttribute (MethodImplOptions.NoInlining)]
|
||||
public static StackTrace get_stacktrace_interp () {
|
||||
var o = new object ();
|
||||
@ -134,6 +140,9 @@ class JitClass
|
||||
var ptr2 = InterpClass.entry_intptr_intptr (ptr);
|
||||
if (ptr != ptr2)
|
||||
return 10;
|
||||
var edgvt_ret = InterpClass.entry_deep_generic_vt (1337, 2m);
|
||||
if (edgvt_ret != 1337)
|
||||
return 11;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/5849bb2f"
|
||||
#define FULL_VERSION "explicit/91e8acb"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
d1ca869157055952213b2a8158b745aa3fe89997
|
||||
066461844794be2d375160338cd66cb426ade879
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
820eb79f663d48b1377af5a3db69ef2e84efeade
|
||||
a886bcf6316bc4493aa27a6a6d21bb20b4f135d5
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
f39f38f9e05474f7c1c34b287e99ad5f347830af
|
||||
c54ecb906f1b39a68084fd8925e1ea78a4f87a64
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.20.0.228\n"
|
||||
"Project-Id-Version: mono 5.20.0.229\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2019-02-27 08:07+0000\n"
|
||||
"POT-Creation-Date: 2019-03-01 08:08+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
7f63d73e6c7f8e83c94cb06cb93d8befee392fe1
|
||||
c5e683afa2d154a531b90f619a133f7a1a570c44
|
Loading…
x
Reference in New Issue
Block a user