Merge branch 'upstream'
Former-commit-id: 83059371e80136f757aa2f5720403601f24074cf
This commit is contained in:
commit
9f2601098a
@ -1 +1 @@
|
||||
d5a77b6f9669692e1a3956edc3401ee858d15d29
|
||||
e144fb4c81ea5f2b02763957153a7fc133a65990
|
@ -1 +1 @@
|
||||
515aec677f2246919f9fc5e20d512518f3ebc881
|
||||
83f0eeb2e9f6b3d265f7039614c5dabcc6b980a6
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.18.0.182";
|
||||
public const string MonoVersion = "5.18.0.184";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -99,7 +99,6 @@ namespace MonoTests.System.Threading
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingRuntimeInterpreter")] /* crashes on linux/armv7 */
|
||||
public void TestCompareExchange_Flt ()
|
||||
{
|
||||
flt = flt_1;
|
||||
|
@ -309,7 +309,6 @@ namespace MonoTests.System.Threading
|
||||
|
||||
[Test]
|
||||
[Category ("NotDotNet")] // it hangs.
|
||||
[Category ("NotWorkingRuntimeInterpreter")] /* crashes on linux/arm64 */
|
||||
public void TestStart()
|
||||
{
|
||||
{
|
||||
|
@ -1 +1 @@
|
||||
3ae30ec5879b05386b8c0d570a13a94f4a6667e2
|
||||
2391dbb65071a4f0a313703b9e3aac16d322de59
|
@ -56,7 +56,6 @@ namespace MonoTests.System {
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("NotWorkingRuntimeInterpreter")]
|
||||
public void ReRegisterForFinalizeTest ()
|
||||
{
|
||||
var thread = new Thread (Run_ReRegisterForFinalizeTest);
|
||||
|
@ -1 +1 @@
|
||||
57c5ddb620c07356e380d15041be93df8e9a3266
|
||||
e577eff8eb250e5bda629e587891c8a792f0de26
|
@ -1 +1 @@
|
||||
9744762d3b06638baeca6a22316491ec531318da
|
||||
738759bac5cbe201cc2c9642b48ebff370d7182c
|
@ -1 +1 @@
|
||||
4d7a80c994375436b3ab7ae2155f55533a8f4422
|
||||
a80dbc9b7ce9382cd5b8f714b603e435e6961859
|
Binary file not shown.
@ -1 +1 @@
|
||||
53da9f4db13d7150e557b9f9d9495999eea3f035
|
||||
4552c28f91d1717b190a55703959d91e6265744c
|
@ -1 +1 @@
|
||||
12f83dd059014cad62684c2aeeb6b76c9d2a10c5
|
||||
75946430bea7677614e2bcce94dd787d4714510a
|
@ -1 +1 @@
|
||||
6686ad9a87af50283ccc3650a3e9399dcd5fee19
|
||||
88e3ea3c498ebbe3a8bba85fc00fe41cdd98460f
|
@ -1 +1 @@
|
||||
1bd7765fd751c0e71cd3374b632a21be8a071d24
|
||||
0e4f60955565b9c00f2051fe2c4a1c516f578c10
|
@ -1 +1 @@
|
||||
57c5ddb620c07356e380d15041be93df8e9a3266
|
||||
e577eff8eb250e5bda629e587891c8a792f0de26
|
@ -1 +1 @@
|
||||
9744762d3b06638baeca6a22316491ec531318da
|
||||
738759bac5cbe201cc2c9642b48ebff370d7182c
|
@ -1 +1 @@
|
||||
4d7a80c994375436b3ab7ae2155f55533a8f4422
|
||||
a80dbc9b7ce9382cd5b8f714b603e435e6961859
|
Binary file not shown.
@ -1 +1 @@
|
||||
53da9f4db13d7150e557b9f9d9495999eea3f035
|
||||
4552c28f91d1717b190a55703959d91e6265744c
|
@ -1 +1 @@
|
||||
12f83dd059014cad62684c2aeeb6b76c9d2a10c5
|
||||
75946430bea7677614e2bcce94dd787d4714510a
|
@ -1 +1 @@
|
||||
6686ad9a87af50283ccc3650a3e9399dcd5fee19
|
||||
88e3ea3c498ebbe3a8bba85fc00fe41cdd98460f
|
@ -1 +1 @@
|
||||
1bd7765fd751c0e71cd3374b632a21be8a071d24
|
||||
0e4f60955565b9c00f2051fe2c4a1c516f578c10
|
@ -1 +1 @@
|
||||
57c5ddb620c07356e380d15041be93df8e9a3266
|
||||
e577eff8eb250e5bda629e587891c8a792f0de26
|
@ -1 +1 @@
|
||||
9744762d3b06638baeca6a22316491ec531318da
|
||||
738759bac5cbe201cc2c9642b48ebff370d7182c
|
@ -1 +1 @@
|
||||
4d7a80c994375436b3ab7ae2155f55533a8f4422
|
||||
a80dbc9b7ce9382cd5b8f714b603e435e6961859
|
Binary file not shown.
@ -1 +1 @@
|
||||
53da9f4db13d7150e557b9f9d9495999eea3f035
|
||||
4552c28f91d1717b190a55703959d91e6265744c
|
@ -1 +1 @@
|
||||
12f83dd059014cad62684c2aeeb6b76c9d2a10c5
|
||||
75946430bea7677614e2bcce94dd787d4714510a
|
@ -1 +1 @@
|
||||
6686ad9a87af50283ccc3650a3e9399dcd5fee19
|
||||
88e3ea3c498ebbe3a8bba85fc00fe41cdd98460f
|
@ -1 +1 @@
|
||||
1bd7765fd751c0e71cd3374b632a21be8a071d24
|
||||
0e4f60955565b9c00f2051fe2c4a1c516f578c10
|
@ -1 +1 @@
|
||||
57c5ddb620c07356e380d15041be93df8e9a3266
|
||||
e577eff8eb250e5bda629e587891c8a792f0de26
|
@ -1 +1 @@
|
||||
9744762d3b06638baeca6a22316491ec531318da
|
||||
738759bac5cbe201cc2c9642b48ebff370d7182c
|
@ -1 +1 @@
|
||||
4d7a80c994375436b3ab7ae2155f55533a8f4422
|
||||
a80dbc9b7ce9382cd5b8f714b603e435e6961859
|
Binary file not shown.
@ -1 +1 @@
|
||||
53da9f4db13d7150e557b9f9d9495999eea3f035
|
||||
4552c28f91d1717b190a55703959d91e6265744c
|
@ -1 +1 @@
|
||||
12f83dd059014cad62684c2aeeb6b76c9d2a10c5
|
||||
75946430bea7677614e2bcce94dd787d4714510a
|
@ -1 +1 @@
|
||||
6686ad9a87af50283ccc3650a3e9399dcd5fee19
|
||||
88e3ea3c498ebbe3a8bba85fc00fe41cdd98460f
|
@ -1 +1 @@
|
||||
1bd7765fd751c0e71cd3374b632a21be8a071d24
|
||||
0e4f60955565b9c00f2051fe2c4a1c516f578c10
|
@ -1 +1 @@
|
||||
0cdb06c50617b775233a4436d4c697e5f9373d5d
|
||||
7cbdc53f71c413123e694c74faf48f5afe162d6d
|
@ -1 +1 @@
|
||||
#define FULL_VERSION "explicit/aebff6c"
|
||||
#define FULL_VERSION "explicit/0522076"
|
||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
0dbb8d440e443a6b8a07ee6663de3b5a9a95dcad
|
||||
31b92b482ec1515202d0328e230edd3684889df8
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
7fa8c463cf127aea36c74bb30c35136e11907da8
|
||||
037ee76f665b1efe7edb6f3f564c1ebb2bc1ee55
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
||||
f8cd786581d5752544366db21ba180e2bc292a32
|
||||
6414ce06a86cd6db0ace9620593095320451dd02
|
@ -6,9 +6,9 @@
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: mono 5.18.0.182\n"
|
||||
"Project-Id-Version: mono 5.18.0.184\n"
|
||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||
"POT-Creation-Date: 2018-10-26 08:11+0000\n"
|
||||
"POT-Creation-Date: 2018-10-30 08:04+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 @@
|
||||
d2ed499e26f6adf38a31a0daac8d3b484ea0861a
|
||||
e9f8bb41ce7da5dade03936f4c92fe4e3ada6897
|
Loading…
x
Reference in New Issue
Block a user