Merge branch 'upstream'

Former-commit-id: 60ebe8f56acf1848c77f21c695a4889a3068562b
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-08-25 08:42:06 +00:00
commit fd3f291caa
38 changed files with 33 additions and 33 deletions

View File

@ -1 +1 @@
77471da09981783f11a22f4c503b67e02d2d7c83
08937f5469bcd2eed7c5ba779294b6329f3b024a

View File

@ -1 +1 @@
46b8fbc938f78685dd03c29c823ff7dd3bfa42ee
3d964514092c9f16851f6124107670d90d829880

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.16.0.119";
public const string MonoVersion = "5.16.0.120";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -1 +1 @@
f62165ad371b9ec669d20dba4fc52964c3f9cc16
59b3f707d19de8e43e7469a739cdafaa2206c784

View File

@ -1 +1 @@
093da4251f1738ab4470e35b77e3a31c4244ad99
f084e3004aa6da6e79446be9001e26a9ad6195ac

View File

@ -1 +1 @@
300f8c4d4432a0dd47f644d12d00dd6e64ed9cac
85b4839a807f2bf411aa32ab0ba84451e144a568

View File

@ -1 +1 @@
4363e0a78df3945bbe4499a3b5ab4724ef2119b7
f304ed214eea68de0cb5ecd50dd0de4c8b84718d

View File

@ -1 +1 @@
a95c24769e0a19c48e64da08da9c543a1fa4ac86
3235d75c575b0982db4136b0ccfeba72588886ca

View File

@ -1 +1 @@
ccc44145bf4838b1934673709cb1d7c1f6eaa99b
c719ef566f1dbfa272ea10ce17301e8b27423fab

View File

@ -1 +1 @@
2168d7fdb9425378ac627e2784398ec34a1517de
90855d0cb7cd711c546a29e6e3513d3a3042d76b

View File

@ -1 +1 @@
f62165ad371b9ec669d20dba4fc52964c3f9cc16
59b3f707d19de8e43e7469a739cdafaa2206c784

View File

@ -1 +1 @@
093da4251f1738ab4470e35b77e3a31c4244ad99
f084e3004aa6da6e79446be9001e26a9ad6195ac

View File

@ -1 +1 @@
300f8c4d4432a0dd47f644d12d00dd6e64ed9cac
85b4839a807f2bf411aa32ab0ba84451e144a568

View File

@ -1 +1 @@
4363e0a78df3945bbe4499a3b5ab4724ef2119b7
f304ed214eea68de0cb5ecd50dd0de4c8b84718d

View File

@ -1 +1 @@
a95c24769e0a19c48e64da08da9c543a1fa4ac86
3235d75c575b0982db4136b0ccfeba72588886ca

View File

@ -1 +1 @@
ccc44145bf4838b1934673709cb1d7c1f6eaa99b
c719ef566f1dbfa272ea10ce17301e8b27423fab

View File

@ -1 +1 @@
2168d7fdb9425378ac627e2784398ec34a1517de
90855d0cb7cd711c546a29e6e3513d3a3042d76b

View File

@ -1 +1 @@
f62165ad371b9ec669d20dba4fc52964c3f9cc16
59b3f707d19de8e43e7469a739cdafaa2206c784

View File

@ -1 +1 @@
093da4251f1738ab4470e35b77e3a31c4244ad99
f084e3004aa6da6e79446be9001e26a9ad6195ac

View File

@ -1 +1 @@
300f8c4d4432a0dd47f644d12d00dd6e64ed9cac
85b4839a807f2bf411aa32ab0ba84451e144a568

View File

@ -1 +1 @@
4363e0a78df3945bbe4499a3b5ab4724ef2119b7
f304ed214eea68de0cb5ecd50dd0de4c8b84718d

View File

@ -1 +1 @@
a95c24769e0a19c48e64da08da9c543a1fa4ac86
3235d75c575b0982db4136b0ccfeba72588886ca

View File

@ -1 +1 @@
ccc44145bf4838b1934673709cb1d7c1f6eaa99b
c719ef566f1dbfa272ea10ce17301e8b27423fab

View File

@ -1 +1 @@
2168d7fdb9425378ac627e2784398ec34a1517de
90855d0cb7cd711c546a29e6e3513d3a3042d76b

View File

@ -724,9 +724,9 @@ decode (char p)
if (p >= '0' && p <= '9')
return p - '0';
if (p >= 'A' && p <= 'F')
return p - 'A';
return (p - 'A') + 10;
if (p >= 'a' && p <= 'f')
return p - 'a';
return (p - 'a') + 10;
g_assert_not_reached ();
return 0;
}

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/0955dd2"
#define FULL_VERSION "explicit/421e62d"

Binary file not shown.

View File

@ -1 +1 @@
a2fc98e61190b0fd984b99d43be79c913294394c
a5514c919489d561b1c206f52f53a14b02ceeba8

Binary file not shown.

View File

@ -1 +1 @@
8f67971ed8eac4992053c75c1a79195cb587992b
f46aeb236aa7db5ad17e3f93f8097c6a517b847b

Binary file not shown.

View File

@ -1 +1 @@
61b9396cf61c8c451465f0bc1fa32aae1952e613
6d47d865be97b938b4de996f038aa5ded39bc100

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.16.0.119\n"
"Project-Id-Version: mono 5.16.0.120\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-08-23 08:04+0000\n"
"POT-Creation-Date: 2018-08-25 08:05+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"

Binary file not shown.

View File

@ -1 +1 @@
c415705f1e0f8158a64983342efbccfdcade0b0a
f0fdaf95c298a61211ef1818a910d2cff7f3939f